diff --git a/redisson/src/main/java/org/redisson/misc/CachedValue.java b/redisson/src/main/java/org/redisson/misc/CachedValue.java
index 8fb9b5d24..de9204ed7 100644
--- a/redisson/src/main/java/org/redisson/misc/CachedValue.java
+++ b/redisson/src/main/java/org/redisson/misc/CachedValue.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2016 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.redisson.misc;
 
 /**
diff --git a/redisson/src/main/java/org/redisson/misc/SoftCachedValue.java b/redisson/src/main/java/org/redisson/misc/SoftCachedValue.java
index 7ae53a248..8a9d9e9db 100644
--- a/redisson/src/main/java/org/redisson/misc/SoftCachedValue.java
+++ b/redisson/src/main/java/org/redisson/misc/SoftCachedValue.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2016 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.redisson.misc;
 
 import java.lang.ref.SoftReference;
@@ -10,7 +25,7 @@ public class SoftCachedValue<K, V> implements CachedValue<K, V> {
     StdCachedValue<K, SoftReference<V>> value;
 
     public SoftCachedValue(K key, V value, long ttl, long maxIdleTime) {
-        this.value = new StdCachedValue<>(key, new SoftReference<>(value), ttl, maxIdleTime);
+        this.value = new StdCachedValue<K, SoftReference<V>>(key, new SoftReference<V>(value), ttl, maxIdleTime);
     }
 
     @Override
diff --git a/redisson/src/main/java/org/redisson/misc/StdCachedValue.java b/redisson/src/main/java/org/redisson/misc/StdCachedValue.java
index edf2c67c7..6ffc82f4d 100644
--- a/redisson/src/main/java/org/redisson/misc/StdCachedValue.java
+++ b/redisson/src/main/java/org/redisson/misc/StdCachedValue.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2016 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.redisson.misc;
 
 /**
diff --git a/redisson/src/main/java/org/redisson/misc/URLBuilder.java b/redisson/src/main/java/org/redisson/misc/URLBuilder.java
index fb8757e60..3ddc71e04 100644
--- a/redisson/src/main/java/org/redisson/misc/URLBuilder.java
+++ b/redisson/src/main/java/org/redisson/misc/URLBuilder.java
@@ -33,7 +33,7 @@ public class URLBuilder {
 
     private static URLStreamHandlerFactory currentFactory;
     
-    private static URLStreamHandlerFactory newFactory = new URLStreamHandlerFactory() {
+    private final static URLStreamHandlerFactory newFactory = new URLStreamHandlerFactory() {
         @Override
         public URLStreamHandler createURLStreamHandler(String protocol) {
             if ("redis".equals(protocol)) {