diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/CacheKey.java b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCacheKey.java
similarity index 92%
rename from common/cache/src/main/java/org/thingsboard/server/cache/CacheKey.java
rename to common/cache/src/main/java/org/thingsboard/server/cache/VersionedCacheKey.java
index db7af5a32b..f339d9def3 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/CacheKey.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCacheKey.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.cache;
 
 import java.io.Serializable;
 
-public interface CacheKey extends Serializable {
+public interface VersionedCacheKey extends Serializable {
 
     default boolean isVersioned() {
         return false;
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCaffeineTbCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCaffeineTbCache.java
index a8363e4f9a..535fa64cd9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCaffeineTbCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedCaffeineTbCache.java
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.util.TbPair;
 
 import java.io.Serializable;
 
-public abstract class VersionedCaffeineTbCache<K extends CacheKey, V extends Serializable & HasVersion> extends CaffeineTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
+public abstract class VersionedCaffeineTbCache<K extends VersionedCacheKey, V extends Serializable & HasVersion> extends CaffeineTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
 
     public VersionedCaffeineTbCache(CacheManager cacheManager, String cacheName) {
         super(cacheManager, cacheName);
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
index d101159ae3..e9b64822e9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
 import java.util.Arrays;
 
 @Slf4j
-public abstract class VersionedRedisTbCache<K extends CacheKey, V extends Serializable & HasVersion> extends RedisTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
+public abstract class VersionedRedisTbCache<K extends VersionedCacheKey, V extends Serializable & HasVersion> extends RedisTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
 
     private static final int VERSION_SIZE = 8;
     private static final int VALUE_END_OFFSET = -1;
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedTbCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedTbCache.java
index 083ce93bac..c610825faf 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedTbCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedTbCache.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-public interface VersionedTbCache<K extends CacheKey, V extends Serializable & HasVersion> extends TbTransactionalCache<K, V> {
+public interface VersionedTbCache<K extends VersionedCacheKey, V extends Serializable & HasVersion> extends TbTransactionalCache<K, V> {
 
     TbCacheValueWrapper<V> get(K key);
 
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceCacheKey.java b/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceCacheKey.java
index c06b3eef27..2a0819851e 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceCacheKey.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceCacheKey.java
@@ -19,7 +19,7 @@ import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 
@@ -29,7 +29,7 @@ import java.io.Serial;
 @EqualsAndHashCode
 @RequiredArgsConstructor
 @Builder
-public class DeviceCacheKey implements CacheKey {
+public class DeviceCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 6366389552842340207L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileCacheKey.java
index 85bc12dea4..aa3f6ce89f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileCacheKey.java
@@ -16,14 +16,14 @@
 package org.thingsboard.server.dao.asset;
 
 import lombok.Data;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 
 import java.io.Serial;
 
 @Data
-public class AssetProfileCacheKey implements CacheKey {
+public class AssetProfileCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 8220455917177676472L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
index 8204494828..def2c6c45c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.attributes;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 
@@ -27,7 +27,7 @@ import java.io.Serial;
 @EqualsAndHashCode
 @Getter
 @AllArgsConstructor
-public class AttributeCacheKey implements CacheKey {
+public class AttributeCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 2013369077925351881L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileCacheKey.java
index 78056508dc..55e8aa66eb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileCacheKey.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.device;
 
 import lombok.Data;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import java.io.Serial;
 
 @Data
-public class DeviceProfileCacheKey implements CacheKey {
+public class DeviceProfileCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 8220455917177676472L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/CachedVersionedEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/CachedVersionedEntityService.java
index d8f322f2c7..46045ab928 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/CachedVersionedEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/CachedVersionedEntityService.java
@@ -16,13 +16,13 @@
 package org.thingsboard.server.dao.entity;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.cache.VersionedTbCache;
 import org.thingsboard.server.common.data.HasVersion;
 
 import java.io.Serializable;
 
-public abstract class CachedVersionedEntityService<K extends CacheKey, V extends Serializable & HasVersion, E> extends AbstractCachedEntityService<K, V, E> {
+public abstract class CachedVersionedEntityService<K extends VersionedCacheKey, V extends Serializable & HasVersion, E> extends AbstractCachedEntityService<K, V, E> {
 
     @Autowired
     protected VersionedTbCache<K, V> cache;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewCacheKey.java
index ff391b0f52..deb1d85b78 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewCacheKey.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.entityview;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -28,7 +28,7 @@ import java.io.Serial;
 @Getter
 @EqualsAndHashCode
 @Builder
-public class EntityViewCacheKey implements CacheKey {
+public class EntityViewCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 5986277528222738163L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsLatestCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsLatestCacheKey.java
index 79756044fa..593bc55e1e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsLatestCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsLatestCacheKey.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.timeseries;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.thingsboard.server.cache.CacheKey;
+import org.thingsboard.server.cache.VersionedCacheKey;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.io.Serial;
@@ -26,7 +26,7 @@ import java.io.Serial;
 @EqualsAndHashCode
 @Getter
 @AllArgsConstructor
-public class TsLatestCacheKey implements CacheKey {
+public class TsLatestCacheKey implements VersionedCacheKey {
 
     @Serial
     private static final long serialVersionUID = 2024369077925351881L;