shopizer-aplcache

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
index f9105ca..5196459 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/catalog/product/relationship/ProductRelationshipRepositoryImpl.java
@@ -22,7 +22,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
     @PersistenceContext
     private EntityManager em;
     
-public static APLCache<List<ProductRelationship>> getByTypeCache1 = new APLCache<>("ProductRelationshipRepositoryImpl.getByType1");
+public static APLCache<List<ProductRelationship>> getByTypeCache1 = new APLCache<>("static-multi:ProductRelationshipRepositoryImpl.getByType1");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product, Language language) {
@@ -62,7 +62,7 @@ return getByTypeCache1.computeIfAbsent(Thread.currentThread(), new Object[]{stor
 
 	}
 	
-public static APLCache<List<ProductRelationship>> getByTypeCache2 = new APLCache<>("ProductRelationshipRepositoryImpl.getByType2");
+public static APLCache<List<ProductRelationship>> getByTypeCache2 = new APLCache<>("static-multi:ProductRelationshipRepositoryImpl.getByType2");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Language language) {
@@ -194,7 +194,7 @@ return getByTypeCache2.computeIfAbsent(Thread.currentThread(), new Object[]{stor
 	}
 	
 	
-public static APLCache<List<ProductRelationship>> getByTypeCache3 = new APLCache<>("ProductRelationshipRepositoryImpl.getByType3");
+public static APLCache<List<ProductRelationship>> getByTypeCache3 = new APLCache<>("static-multi:ProductRelationshipRepositoryImpl.getByType3");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type) {
@@ -262,7 +262,7 @@ return getByTypeCache3.computeIfAbsent(Thread.currentThread(), new Object[]{stor
 
 	}
 	
-public static APLCache<List<ProductRelationship>> getByTypeCache4 = new APLCache<>("ProductRelationshipRepositoryImpl.getByType4");
+public static APLCache<List<ProductRelationship>> getByTypeCache4 = new APLCache<>("static-multi:ProductRelationshipRepositoryImpl.getByType4");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product) {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.java
index eeb68d4..6115ca0 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepositoryImpl.java
@@ -21,7 +21,7 @@ public class ContentRepositoryImpl implements ContentRepositoryCustom {
     @PersistenceContext
     private EntityManager em;
     
-public static APLCache<List<ContentDescription>> listNameByTypeCache = new APLCache<>("ContentRepositoryImpl.listNameByType");
+public static APLCache<List<ContentDescription>> listNameByTypeCache = new APLCache<>("static-multi:ContentRepositoryImpl.listNameByType");
 
 	@Override
 	public List<ContentDescription> listNameByType(List<ContentType> contentType, MerchantStore store, Language language) {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.java
index d5df237..605a62e 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/category/CategoryServiceImpl.java
@@ -354,7 +354,7 @@ public class CategoryServiceImpl extends SalesManagerEntityServiceImpl<Long, Cat
 
 	}
 	
-public static APLCache<List<Category>> listByDepthCache1 = new APLCache<>("CategoryServiceImpl.listByDepth1");
+public static APLCache<List<Category>> listByDepthCache1 = new APLCache<>("static-multi:CategoryServiceImpl.listByDepth1");
 
 	@Override
 	public List<Category> listByDepth(MerchantStore store, int depth) {
@@ -363,7 +363,7 @@ return listByDepthCache1.computeIfAbsent(Thread.currentThread(), new Object[]{st
 }, 1200000);
 	}
 
-public static APLCache<List<Category>> listByDepthCache2 = new APLCache<>("CategoryServiceImpl.listByDepth2");
+public static APLCache<List<Category>> listByDepthCache2 = new APLCache<>("static-multi:CategoryServiceImpl.listByDepth2");
 	@Override
 	public List<Category> listByDepth(MerchantStore store, int depth, Language language) {
 return listByDepthCache2.computeIfAbsent(Thread.currentThread(), new Object[]{store, depth, language}, () -> {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
index e33ed96..49e3594 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
@@ -48,7 +48,7 @@ public class ContentServiceImpl
         this.contentRepository = contentRepository;
     }
 
-    public static APLCache<List<Content>> listByTypeCache1 = new APLCache<>("ContentServiceImpl.listByType1");
+    public static APLCache<List<Content>> listByTypeCache1 = new APLCache<>("static-multi:ContentServiceImpl.listByType1");
 
     @Override
     public List<Content> listByType( ContentType contentType, MerchantStore store, Language language )
@@ -74,7 +74,7 @@ return listByTypeCache1.computeIfAbsent(Thread.currentThread(), new Object[]{con
     	return contentRepository.findByIdAndLanguage(id, language.getId());
     }
     
-public static APLCache<List<Content>> listByTypeCache2 = new APLCache<>("ContentServiceImpl.listByType2");
+public static APLCache<List<Content>> listByTypeCache2 = new APLCache<>("static-multi:ContentServiceImpl.listByType2");
 
     @Override
     public List<Content> listByType(  List<ContentType> contentType,  MerchantStore store,  Language language )
@@ -91,7 +91,7 @@ return listByTypeCache2.computeIfAbsent(Thread.currentThread(), new Object[]{con
 }, 1200000);
     }
     
-public static APLCache<List<ContentDescription>> listNameByTypeCache = new APLCache<>("ContentServiceImpl.listNameByType");
+public static APLCache<List<ContentDescription>> listNameByTypeCache = new APLCache<>("static-multi:ContentServiceImpl.listNameByType");
 
     @Override
     public List<ContentDescription> listNameByType(  List<ContentType> contentType,  MerchantStore store,  Language language )
@@ -104,7 +104,7 @@ return listNameByTypeCache.computeIfAbsent(Thread.currentThread(), new Object[]{
 }, 1200000);
     }
     
-public static APLCache<List<Content>> listByTypeCache3 = new APLCache<>("ContentServiceImpl.listByType3");
+public static APLCache<List<Content>> listByTypeCache3 = new APLCache<>("static-multi:ContentServiceImpl.listByType3");
 
     @Override
     public List<Content> listByType(  List<ContentType> contentType,  MerchantStore store )

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
index a288a05..7cf5eaa 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
@@ -78,7 +78,7 @@ public class MerchantStoreServiceImpl extends SalesManagerEntityServiceImpl<Inte
 	}
 	
 
-public static APLCache<MerchantStore> getByCodeCache = new APLCache<>("MerchantStoreServiceImpl.getByCode");
+public static APLCache<MerchantStore> getByCodeCache = new APLCache<>("static-multi:MerchantStoreServiceImpl.getByCode");
 
 	@Override
 	public MerchantStore getByCode(String code) throws ServiceException {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
index c0b955a..37f6e28 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
@@ -43,7 +43,7 @@ public class MerchantConfigurationServiceImpl extends
 		return merchantConfigurationRepository.findByMerchantStore(store.getId());
 	}
 	
-public static APLCache<List<MerchantConfiguration>> listByTypeCache = new APLCache<>("MerchantConfigurationServiceImpl.listByType");
+public static APLCache<List<MerchantConfiguration>> listByTypeCache = new APLCache<>("static-multi:MerchantConfigurationServiceImpl.listByType");
 
 	@Override
 	public List<MerchantConfiguration> listByType(MerchantConfigurationType type, MerchantStore store) throws ServiceException {
@@ -74,7 +74,7 @@ return listByTypeCache.computeIfAbsent(Thread.currentThread(), new Object[]{type
 		}
 	}
 	
-public static APLCache<MerchantConfig> getMerchantConfigCache = new APLCache<>("MerchantConfigurationServiceImpl.getMerchantConfig");
+public static APLCache<MerchantConfig> getMerchantConfigCache = new APLCache<>("static-multi:MerchantConfigurationServiceImpl.getMerchantConfig");
 
 	@Override
 	public MerchantConfig getMerchantConfig(MerchantStore store) throws ServiceException {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index ed869b0..544aaef 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -707,7 +707,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 	   }
 */	
 	
-public static APLCache<Map<String, List<ContentDescription>>> getContentPagesNamesCache = new APLCache<>("StoreFilter.getContentPagesNames");
+public static APLCache<Map<String, List<ContentDescription>>> getContentPagesNamesCache = new APLCache<>("static-multi:StoreFilter.getContentPagesNames");
 
 	   private Map<String, List<ContentDescription>> getContentPagesNames(MerchantStore store, Language language) throws Exception {
 return getContentPagesNamesCache.computeIfAbsent(Thread.currentThread(), new Object[]{store, language}, () -> {
@@ -758,7 +758,7 @@ return getContentPagesNamesCache.computeIfAbsent(Thread.currentThread(), new Obj
 }, 1200000);
 	   }
 	   
-public static APLCache<Map<String, List<Content>>> getContentCache = new APLCache<>("StoreFilter.getContent");
+public static APLCache<Map<String, List<Content>>> getContentCache = new APLCache<>("static-multi:StoreFilter.getContent");
 
 	   private Map<String, List<Content>> getContent(MerchantStore store, Language language) throws Exception {
 return getContentCache.computeIfAbsent(Thread.currentThread(), new Object[]{store, language}, () -> {
@@ -892,7 +892,7 @@ return getContentCache.computeIfAbsent(Thread.currentThread(), new Object[]{stor
 			return objects;
 	   }
 	   
-public static APLCache<Map<String,Object>> getConfigurationsCache = new APLCache<>("StoreFilter.getConfigurations");
+public static APLCache<Map<String,Object>> getConfigurationsCache = new APLCache<>("static-multi:StoreFilter.getConfigurations");
 
 	   @SuppressWarnings("unused")
 	private Map<String,Object> getConfigurations(MerchantStore store) {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
index 95bf97a..ad9d1df 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/facade/CategoryFacadeImpl.java
@@ -28,7 +28,7 @@ public class CategoryFacadeImpl implements CategoryFacade {
 	@Inject
 	private LanguageService languageService;
 
-public static APLCache<List<ReadableCategory>> getCategoryHierarchyCache = new APLCache<>("CategoryFacadeImpl.getCategoryHierarchy");
+public static APLCache<List<ReadableCategory>> getCategoryHierarchyCache = new APLCache<>("static-multi:CategoryFacadeImpl.getCategoryHierarchy");
 
 	@Override
 	public List<ReadableCategory> getCategoryHierarchy(MerchantStore store,