shopizer-memoizeit

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
index c77fc6c..868603f 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
@@ -24,7 +24,7 @@ public class GeoLocationImpl implements GeoLocation {
 	private static final Logger LOGGER = LoggerFactory.getLogger( GeoLocationImpl.class );
 
 
-public static SingleCache<String, Address> getAddressCache = new SingleCache<>("GeoLocationImpl.getAddress");
+public static SingleCache<String, Address> getAddressCache = new SingleCache<>("static-single:11#GeoLocationImpl.getAddress");
 
 	@Override
 	public Address getAddress(String ipAddress) throws Exception {

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 e70dea7..53c09b9 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
@@ -24,7 +24,7 @@ public class ProductRelationshipRepositoryImpl implements ProductRelationshipRep
     @PersistenceContext
     private EntityManager em;
 
-public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache1 = new SingleCache<>("ProductRelationshipRepositoryImpl.getByType1");
+public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache1 = new SingleCache<>("static-single:12#ProductRelationshipRepositoryImpl.getByType1");
     
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product, Language language) {
@@ -64,7 +64,7 @@ return getByTypeCache1.computeIfAbsent(new Parameters(store, type, product, lang
 
 	}
 	
-public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache2 = new SingleCache<>("ProductRelationshipRepositoryImpl.getByType2");
+public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache2 = new SingleCache<>("static-single:12#ProductRelationshipRepositoryImpl.getByType2");
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Language language) {
 return getByTypeCache2.computeIfAbsent(new Parameters(store, type, language),  () -> {
@@ -195,7 +195,7 @@ return getByTypeCache2.computeIfAbsent(new Parameters(store, type, language),  (
 
 	}
 	
-	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache3 = new SingleCache<>("ProductRelationshipRepositoryImpl.getByType3");
+	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache3 = new SingleCache<>("static-single:12#ProductRelationshipRepositoryImpl.getByType3");
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type) {
 
@@ -263,7 +263,7 @@ return getByTypeCache3.computeIfAbsent(new Parameters(store, type),  () -> {
 	}
 	
 
-	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache4 = new SingleCache<>("ProductRelationshipRepositoryImpl.getByType4");
+	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache4 = new SingleCache<>("static-single:12#ProductRelationshipRepositoryImpl.getByType4");
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product) {
 return getByTypeCache4.computeIfAbsent(new Parameters(store, type, product),  () -> {

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 1ec5214..7c8fc5d 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
@@ -355,7 +355,7 @@ public class CategoryServiceImpl extends SalesManagerEntityServiceImpl<Long, Cat
 
 	}
 	
-public static SingleCache<Parameters, List<Category>> listByDepthCache1 = new SingleCache<>("CategoryServiceImpl.listByDepth1");
+public static SingleCache<Parameters, List<Category>> listByDepthCache1 = new SingleCache<>("static-single:8#CategoryServiceImpl.listByDepth1");
 
 	@Override
 	public List<Category> listByDepth(MerchantStore store, int depth) {
@@ -364,7 +364,7 @@ return listByDepthCache1.computeIfAbsent(new Parameters(store, depth),  () -> {
 }, 1200000);
 	}
 	
-public static SingleCache<Parameters, List<Category>> listByDepthCache2 = new SingleCache<>("CategoryServiceImpl.listByDepth2");
+public static SingleCache<Parameters, List<Category>> listByDepthCache2 = new SingleCache<>("static-single:8#CategoryServiceImpl.listByDepth2");
 	@Override
 	public List<Category> listByDepth(MerchantStore store, int depth, Language language) {
 return listByDepthCache2.computeIfAbsent(new Parameters(store, depth, language),  () -> {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.java
index b92f9e0..cc0d661 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/catalog/product/relationship/ProductRelationshipServiceImpl.java
@@ -103,7 +103,7 @@ public class ProductRelationshipServiceImpl extends
 
 	}
 	
-public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache1 = new SingleCache<>("ProductRelationshipServiceImpl.getByType1");
+public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache1 = new SingleCache<>("static-single:28#ProductRelationshipServiceImpl.getByType1");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, Product product, ProductRelationshipType type, Language language) throws ServiceException {
@@ -114,7 +114,7 @@ return getByTypeCache1.computeIfAbsent(new Parameters(store, product, type, lang
 
 	}
 	
-public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache2 = new SingleCache<>("ProductRelationshipServiceImpl.getByType2");
+public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache2 = new SingleCache<>("static-single:28#ProductRelationshipServiceImpl.getByType2");
 
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, ProductRelationshipType type, Language language) throws ServiceException {
@@ -123,7 +123,7 @@ return getByTypeCache2.computeIfAbsent(new Parameters(store, type, language),  (
 }, 1200000);
 	}
 	
-public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache3 = new SingleCache<>("ProductRelationshipServiceImpl.getByType3");
+public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache3 = new SingleCache<>("static-single:28#ProductRelationshipServiceImpl.getByType3");
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, ProductRelationshipType type) throws ServiceException {
 return getByTypeCache3.computeIfAbsent(new Parameters(store, type),  () -> {
@@ -133,7 +133,7 @@ return getByTypeCache3.computeIfAbsent(new Parameters(store, type),  () -> {
 
 	}
 
-public static SingleCache<Parameters, List<ProductRelationship>> getByGroupCache1 = new SingleCache<>("ProductRelationshipServiceImpl.getByGroup1");
+public static SingleCache<Parameters, List<ProductRelationship>> getByGroupCache1 = new SingleCache<>("static-single:25#ProductRelationshipServiceImpl.getByGroup1");
 	
 	@Override
 	public List<ProductRelationship> getByGroup(MerchantStore store, String groupName) throws ServiceException {
@@ -144,7 +144,7 @@ return getByGroupCache1.computeIfAbsent(new Parameters(store, groupName),  () ->
 
 	}
 	
-	public static SingleCache<Parameters, List<ProductRelationship>> getByGroupCache2 = new SingleCache<>("ProductRelationshipServiceImpl.getByGroup2");
+	public static SingleCache<Parameters, List<ProductRelationship>> getByGroupCache2 = new SingleCache<>("static-single:25#ProductRelationshipServiceImpl.getByGroup2");
 
 	@Override
 	public List<ProductRelationship> getByGroup(MerchantStore store, String groupName, Language language) throws ServiceException {
@@ -155,7 +155,7 @@ return getByGroupCache2.computeIfAbsent(new Parameters(store, groupName, languag
 
 	}
 
-	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache4 = new SingleCache<>("ProductRelationshipServiceImpl.getByType4");
+	public static SingleCache<Parameters, List<ProductRelationship>> getByTypeCache4 = new SingleCache<>("static-single:28#ProductRelationshipServiceImpl.getByType4");
 	
 	@Override
 	public List<ProductRelationship> getByType(MerchantStore store, Product product, ProductRelationshipType type) throws ServiceException {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.java
index df80a33..54003cf 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/common/generic/SalesManagerEntityServiceImpl.java
@@ -73,7 +73,7 @@ public abstract class SalesManagerEntityServiceImpl<K extends Serializable & Com
 		return repository.findAll();
 	}
 	
-public static GetterCache<Long> countCache = new GetterCache<>("SalesManagerEntityServiceImpl.count");
+public static GetterCache<Long> countCache = new GetterCache<>("static-getter:5#SalesManagerEntityServiceImpl.count");
 	public Long count() {
 return countCache.computeIfAbsent(() -> {
 		return repository.count();

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 755e08a..620d419 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
@@ -87,7 +87,7 @@ public class ContentServiceImpl
         return contentRepository.findByTypes( contentType, store.getId(), language.getId() );
     }
     
-public static SingleCache<Parameters, List<ContentDescription>> listNameByTypeCache = new SingleCache<>("ContentServiceImpl.listNameByType");
+public static SingleCache<Parameters, List<ContentDescription>> listNameByTypeCache = new SingleCache<>("static-single:21#ContentServiceImpl.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/customer/CustomerServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/customer/CustomerServiceImpl.java
index 71c6620..9d02c9e 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/customer/CustomerServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/customer/CustomerServiceImpl.java
@@ -54,7 +54,7 @@ public class CustomerServiceImpl extends SalesManagerEntityServiceImpl<Long, Cus
 			return customerRepository.findOne(id);		
 	}
 	
-public static SingleCache<String, Customer> getByNickCache1 = new SingleCache<>("CustomerServiceImpl.getByNick1");
+public static SingleCache<String, Customer> getByNickCache1 = new SingleCache<>("static-single:7#CustomerServiceImpl.getByNick1");
 
 	@Override
 	public Customer getByNick(String nick) {
@@ -63,7 +63,7 @@ return getByNickCache1.computeIfAbsent(nick,  () -> {
 }, 1200000);
 	}
 	
-public static SingleCache<Parameters, Customer> getByNickCache2 = new SingleCache<>("CustomerServiceImpl.getByNick2");
+public static SingleCache<Parameters, Customer> getByNickCache2 = new SingleCache<>("static-single:7#CustomerServiceImpl.getByNick2");
 	@Override
 	public Customer getByNick(String nick, int storeId) {
 return getByNickCache2.computeIfAbsent(new Parameters(nick, storeId),  () -> {
@@ -81,7 +81,7 @@ return getByNickCache2.computeIfAbsent(new Parameters(nick, storeId),  () -> {
 		return customerRepository.listByStore(store,criteria);
 	}
 	
-public static SingleCache<Parameters, Address> getCustomerAddressCache = new SingleCache<>("CustomerServiceImpl.getCustomerAddress");
+public static SingleCache<Parameters, Address> getCustomerAddressCache = new SingleCache<>("static-single:16#CustomerServiceImpl.getCustomerAddress");
 
 	@Override
 	public Address getCustomerAddress(MerchantStore store, String ipAddress) throws ServiceException {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.java
index dd7ec76..c17ada3 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/init/InitializationDatabaseImpl.java
@@ -81,7 +81,7 @@ public class InitializationDatabaseImpl implements InitializationDatabase {
 	private String name;
 	
 
-public static GetterCache<Boolean> isEmptyCache = new GetterCache<>("InitializationDatabaseImpl.isEmpty");
+public static GetterCache<Boolean> isEmptyCache = new GetterCache<>("static-getter:6#InitializationDatabaseImpl.isEmpty");
 
 	public boolean isEmpty() {
 return isEmptyCache.computeIfAbsent(() -> {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
index 0f38ada..9f8e963 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
@@ -42,7 +42,7 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
 		this.zoneRepository = zoneRepository;
 	}
 
-public static SingleCache<String, Zone> getByCodeCache = new SingleCache<>("ZoneServiceImpl.getByCode");
+public static SingleCache<String, Zone> getByCodeCache = new SingleCache<>("static-single:9#ZoneServiceImpl.getByCode");
 	@Override
 	public Zone getByCode(String code) {
 return getByCodeCache.computeIfAbsent(code,  () -> {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/system/EmailServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/system/EmailServiceImpl.java
index 7a59c2f..b3720c1 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/system/EmailServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/system/EmailServiceImpl.java
@@ -33,7 +33,7 @@ public class EmailServiceImpl implements EmailService {
 		sender.send(email);
 	}
 
-public static SingleCache<MerchantStore, EmailConfig> getEmailConfigurationCache = new SingleCache<>("EmailServiceImpl.getEmailConfiguration");
+public static SingleCache<MerchantStore, EmailConfig> getEmailConfigurationCache = new SingleCache<>("static-single:17#EmailServiceImpl.getEmailConfiguration");
 
 	@Override
 	public EmailConfig getEmailConfiguration(MerchantStore store) {

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 cd99860..495826d 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
@@ -70,7 +70,7 @@ public class MerchantConfigurationServiceImpl extends
 		}
 	}
 	
-public static SingleCache<MerchantStore, MerchantConfig> getMerchantConfigCache = new SingleCache<>("MerchantConfigurationServiceImpl.getMerchantConfig");
+public static SingleCache<MerchantStore, MerchantConfig> getMerchantConfigCache = new SingleCache<>("static-single:10#MerchantConfigurationServiceImpl.getMerchantConfig");
 
 	@Override
 	public MerchantConfig getMerchantConfig(MerchantStore store) {

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 0a12202..9e368f5 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
@@ -708,7 +708,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 	   }
 */	
 	
-public static SingleCache<Parameters, Map<String, List<ContentDescription>>> getContentPagesNamesCache = new SingleCache<>("StoreFilter.getContentPagesNames");
+public static SingleCache<Parameters, Map<String, List<ContentDescription>>> getContentPagesNamesCache = new SingleCache<>("static-single:22#StoreFilter.getContentPagesNames");
 
 	   private Map<String, List<ContentDescription>> getContentPagesNames(MerchantStore store, Language language) throws Exception {
 		   
@@ -761,7 +761,7 @@ return getContentPagesNamesCache.computeIfAbsent(new Parameters(store, language)
 }, 1200000);
 	   }
 
-public static SingleCache<Parameters, Map<String, List<Content>>> getContentCache = new SingleCache<>("StoreFilter.getContentCache");
+public static SingleCache<Parameters, Map<String, List<Content>>> getContentCache = new SingleCache<>("static-single:20#StoreFilter.getContent");
 	   
 	   private Map<String, List<Content>> getContent(MerchantStore store, Language language) throws Exception {
 return getContentCache.computeIfAbsent(new Parameters(store, language),  () -> {
@@ -896,7 +896,7 @@ try {
 			return objects;
 	   }
 	   
-public static SingleCache<MerchantStore, Map<String, Object>> getConfigurationsCache = new SingleCache<>("StoreFilter.getConfigurations");
+public static SingleCache<MerchantStore, Map<String, Object>> getConfigurationsCache = new SingleCache<>("static-single:32#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 ffcbb4e..20990cc 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
@@ -29,7 +29,7 @@ public class CategoryFacadeImpl implements CategoryFacade {
 	@Inject
 	private LanguageService languageService;
 
-public static SingleCache<Parameters, List<ReadableCategory>> getCategoryHierarchyCache = new SingleCache<>("CategoryFacadeImpl.getCategoryHierarchy");
+public static SingleCache<Parameters, List<ReadableCategory>> getCategoryHierarchyCache = new SingleCache<>("static-single:26#CategoryFacadeImpl.getCategoryHierarchy");
 
 
 	@Override

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
index 41ae4ec..4196af1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
@@ -237,7 +237,7 @@ public class CustomerFacadeImpl implements CustomerFacade
     }
 
 
-public static SingleCache<Parameters, Customer> getCustomerByUserNameCache = new SingleCache<>("CustomerFacadeImpl.getCustomerByUserName");
+public static SingleCache<Parameters, Customer> getCustomerByUserNameCache = new SingleCache<>("static-single:27#CustomerFacadeImpl.getCustomerByUserName");
 
 
  	@Override

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
index c0e6513..d2527cf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
@@ -48,7 +48,7 @@ public class ErrorController {
  
 	}
 	
-public static SingleCache<Exception, ModelAndView> handleRuntimeExceptionCache = new SingleCache<>("ErrorController.handleRuntimeException");
+public static SingleCache<Exception, ModelAndView> handleRuntimeExceptionCache = new SingleCache<>("static-single:3#ErrorController.handleRuntimeException");
 
 	@ExceptionHandler(RuntimeException.class)
 	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
index 8b2121b..c501011 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
@@ -20,7 +20,7 @@ public class BeanUtils
         return new BeanUtils();
     }
 
-public static SingleCache<Parameters, Object> getPropertyValueCache = new SingleCache<>("BeanUtils.getPropertyValue");
+public static SingleCache<Parameters, Object> getPropertyValueCache = new SingleCache<>("static-single:2#BeanUtils.getPropertyValue");
     
     @SuppressWarnings( "nls" )
     public Object getPropertyValue( Object bean, String property )
@@ -60,7 +60,7 @@ try {
         }, 1200000);
     }
 
-public static SingleCache<Parameters, PropertyDescriptor> getPropertyDescriptorCache = new SingleCache<>("BeanUtils.getPropertyDescriptor");
+public static SingleCache<Parameters, PropertyDescriptor> getPropertyDescriptorCache = new SingleCache<>("static-single:1#BeanUtils.getPropertyDescriptor");
 
     private PropertyDescriptor getPropertyDescriptor( Class<?> beanClass, String propertyname )
         // throws IntrospectionException

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
index 95b2b63..d059d14 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
@@ -29,7 +29,7 @@ public class EmailUtils {
 	@Qualifier("img")
 	private ImageFilePath imageUtils;
 	
-public static SingleCache<Parameters, Map<String, String>> createEmailObjectsMapCache = new SingleCache<>("EmailUtils.createEmailObjectsMap");
+public static SingleCache<Parameters, Map<String, String>> createEmailObjectsMapCache = new SingleCache<>("static-single:13#EmailUtils.createEmailObjectsMap");
 
 	/**
 	 * Builds generic html email information

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
index 73c01e5..533c7f3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
@@ -27,7 +27,7 @@ public class FieldMatchValidator implements ConstraintValidator<FieldMatch, Obje
     }
 
 
-public static SingleCache<Parameters, Boolean> isValidCache = new SingleCache<>("FieldMatchValidator.isValid");
+public static SingleCache<Parameters, Boolean> isValidCache = new SingleCache<>("static-single:4#FieldMatchValidator.isValid");
 
     @SuppressWarnings( "nls" )
     @Override