thingsboard-developers

diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index 3bccf57..2f246de 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -100,7 +100,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     final DeviceId deviceId;
     // private final Map<UUID, SessionInfoMetaData> sessions;
  
-private MultiCache<UUID, SessionInfoMetaData> sessions = new MultiCache<>("DeviceActorMessageProcessor.sessions");
+private MultiCache<UUID, SessionInfoMetaData> sessions = new MultiCache<>("instance-multi:DeviceActorMessageProcessor.sessions");
 
     private final Map<UUID, SessionInfo> attributeSubscriptions;
     private final Map<UUID, SessionInfo> rpcSubscriptions;
@@ -645,7 +645,7 @@ private MultiCache<UUID, SessionInfoMetaData> sessions = new MultiCache<>("Devic
         return builder.build();
     }
 
-public static MultiCache<DeviceId, List<TransportProtos.SessionSubscriptionInfoProto>> deviceSessionCache = new MultiCache<>("ActorSystemContext.deviceSession");
+public static MultiCache<DeviceId, List<TransportProtos.SessionSubscriptionInfoProto>> deviceSessionCache = new MultiCache<>("static-multi:ActorSystemContext.deviceSession");
 
    private void restoreSessions() {
        log.debug("[{}] Restoring sessions from cache", deviceId);

diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index 79fd06e..9f9b0c5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -103,7 +103,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
         return assetDao.findByIdAsync(tenantId, assetId.getId());
     }
 
-public static MultiCache<Parameters, Asset> findAssetByTenantIdAndNameCache = new MultiCache<>("BaseAssetService.findAssetByTenantIdAndName");
+public static MultiCache<Parameters, Asset> findAssetByTenantIdAndNameCache = new MultiCache<>("static-multi:BaseAssetService.findAssetByTenantIdAndName");
 
 //    @Cacheable(cacheNames = ASSET_CACHE, key = "{#tenantId, #name}")
     @Override

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
index e078b88..b3bfe76 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
@@ -55,7 +55,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService {
         return deviceCredentialsDao.findByDeviceId(tenantId, deviceId.getId());
     }
 
-public static MultiCache<String, DeviceCredentials> findDeviceCredentialsByCredentialsIdCache = new MultiCache<>("DeviceCredentialsServiceImpl.findDeviceCredentialsByCredentialsId");
+public static MultiCache<String, DeviceCredentials> findDeviceCredentialsByCredentialsIdCache = new MultiCache<>("static-multi:DeviceCredentialsServiceImpl.findDeviceCredentialsByCredentialsId");
 
     @Override
 //    @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, unless = "#result == null")

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index d0c9b42..14671ad 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -111,7 +111,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
         return deviceDao.findByIdAsync(tenantId, deviceId.getId());
     }
 
-public static MultiCache<Parameters, Device> findDeviceByTenantIdAndNameCache = new MultiCache<>("DeviceServiceImpl.findDeviceByTenantIdAndName");
+public static MultiCache<Parameters, Device> findDeviceByTenantIdAndNameCache = new MultiCache<>("static-multi:DeviceServiceImpl.findDeviceByTenantIdAndName");
 
 //    @Cacheable(cacheNames = DEVICE_CACHE, key = "{#tenantId, #name}")
     @Override

diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index 46a84b5..ae7d66a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -131,7 +131,7 @@ findEntityViewByIdCache.invalidate(entityViewId);
         customerEntityViewsUnAssigner.removeEntities(tenantId, customerId);
     }
 
-public static MultiCache<EntityViewId, EntityView> findEntityViewByIdCache = new MultiCache<>("EntityViewServiceImpl.findEntityViewById");
+public static MultiCache<EntityViewId, EntityView> findEntityViewByIdCache = new MultiCache<>("static-multi:EntityViewServiceImpl.findEntityViewById");
 
 //    @Cacheable(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityViewId}")
     @Override
@@ -143,7 +143,7 @@ return findEntityViewByIdCache.computeIfAbsent(entityViewId, () -> {
 }, 1440000);
     }
 
-public static MultiCache<Parameters, EntityView> findEntityViewByTenantIdAndNameCache = new MultiCache<>("EntityViewServiceImpl.findEntityViewByTenantIdAndName");
+public static MultiCache<Parameters, EntityView> findEntityViewByTenantIdAndNameCache = new MultiCache<>("static-multi:EntityViewServiceImpl.findEntityViewByTenantIdAndName");
 
 //    @Cacheable(cacheNames = ENTITY_VIEW_CACHE, key = "{#tenantId, #name}")
     @Override

diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
index 3381850..447ab77 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
@@ -76,7 +76,7 @@ public class BaseRelationService implements RelationService {
         return relationDao.checkRelation(tenantId, from, to, relationType, typeGroup);
     }
 
-public static MultiCache<Parameters, EntityRelation> getRelationCache = new MultiCache<>("BaseRelationService.getRelation");
+public static MultiCache<Parameters, EntityRelation> getRelationCache = new MultiCache<>("static-multi:BaseRelationService.getRelation");
 
 //    @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType, #typeGroup}")
     @Override
@@ -316,7 +316,7 @@ public static MultiCache<Parameters, EntityRelation> getRelationCache = new Mult
 //        cache.evict(toTypeAndTypeGroup);
     }
 
-public static MultiCache<Parameters, List<EntityRelation>> findByFromCache = new MultiCache<>("BaseRelationService.findByFrom");
+public static MultiCache<Parameters, List<EntityRelation>> findByFromCache = new MultiCache<>("static-multi:BaseRelationService.findByFrom");
 
 //    @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup, 'FROM'}")
     @Override
@@ -388,7 +388,7 @@ try {
                 });
     }
 
-public static MultiCache<Parameters, List<EntityRelation>> findByFromAndTypeCache = new MultiCache<>("BaseRelationService.findByFromAndType");
+public static MultiCache<Parameters, List<EntityRelation>> findByFromAndTypeCache = new MultiCache<>("static-multi:BaseRelationService.findByFromAndType");
 
 //    @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType, #typeGroup, 'FROM'}")
     @Override
@@ -411,7 +411,7 @@ return findByFromAndTypeCache.computeIfAbsent(new Parameters(from, relationType,
         return relationDao.findAllByFromAndType(tenantId, from, relationType, typeGroup);
     }
 
-public static MultiCache<Parameters, List<EntityRelation>> findByToCache = new MultiCache<>("BaseRelationService.findByTo");
+public static MultiCache<Parameters, List<EntityRelation>> findByToCache = new MultiCache<>("static-multi:BaseRelationService.findByTo");
 
 //    @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup, 'TO'}")
     @Override
@@ -493,7 +493,7 @@ try{
         });
     }
 
-public static MultiCache<Parameters, List<EntityRelation>> findByToAndTypeCache = new MultiCache<>("BaseRelationService.findByToAndType");
+public static MultiCache<Parameters, List<EntityRelation>> findByToAndTypeCache = new MultiCache<>("static-multi:BaseRelationService.findByToAndType");
 
 //    @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType, #typeGroup, 'TO'}")
     @Override

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
index f492252..1b23b0f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
@@ -83,7 +83,7 @@ public abstract class TbAbstractCustomerActionNode<C extends TbAbstractCustomerA
 
     protected abstract void doProcessCustomerAction(TbContext ctx, TbMsg msg, CustomerId customerId);
 
-private MultiCache<CustomerKey, Optional<CustomerId>> getCustomerCache = new MultiCache<>("TbAbstractCustomerActionNode.getCustomer");
+private MultiCache<CustomerKey, Optional<CustomerId>> getCustomerCache = new MultiCache<>("instance-multi:TbAbstractCustomerActionNode.getCustomer");
 
     protected ListenableFuture<CustomerId> getCustomer(TbContext ctx, TbMsg msg) {
         String customerTitle = TbNodeUtils.processPattern(this.config.getCustomerNamePattern(), msg.getMetaData());