diff --git a/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java b/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java
index a5c41efd..2ee75f39 100644
--- a/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java
+++ b/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java
@@ -22,9 +22,6 @@
  * #L%
  */
 
-
-import java.io.Serializable;
-
 /**
  *
  * @author t.marx
diff --git a/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java b/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java
index 2c0290ec..54f48a5c 100644
--- a/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java
+++ b/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java
@@ -26,7 +26,6 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.RequiredArgsConstructor;
 import com.condation.cms.api.cache.ICache;
-import java.io.Serializable;
 import java.util.function.Function;
 
 /**
@@ -36,7 +35,7 @@
  * @param <V>
  */
 @RequiredArgsConstructor
-public class LocalCache<K extends Serializable, V extends Serializable> implements ICache<K, V> {
+public class LocalCache<K, V> implements ICache<K, V> {
 	
 	private final Cache<K,V> wrappedCache;
 	private final Function<K, V> loader;
diff --git a/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java b/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java
index 4cfc08c2..ddc1972f 100644
--- a/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java
+++ b/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java
@@ -62,7 +62,7 @@ public boolean hasFilters () {
 	}
 	
 	public TemplateConfiguration setCache (ICache<String, Template> cache) {
-		if (templateCache != null) {
+		if (templateCache == null) {
 			templateCache = new TemplateCache(cache);
 		}
 		return this;