diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbCacheTransaction.java b/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbCacheTransaction.java
index 03d9099541..47778c96b6 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbCacheTransaction.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbCacheTransaction.java
@@ -38,7 +38,7 @@ public class CaffeineTbCacheTransaction<K extends Serializable, V extends Serial
     @Setter
     private boolean failed;
 
-    private final Map<Object, Object> pendingPuts = new LinkedHashMap<>();
+    private final Map<K, V> pendingPuts = new LinkedHashMap<>();
 
     @Override
     public void put(K key, V value) {
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbTransactionalCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbTransactionalCache.java
index e0a1457d72..d2ea960e68 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbTransactionalCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/CaffeineTbTransactionalCache.java
@@ -116,7 +116,7 @@ public abstract class CaffeineTbTransactionalCache<K extends Serializable, V ext
         return newTransaction(keys);
     }
 
-    void doPutIfAbsent(Object key, Object value) {
+    void doPutIfAbsent(K key, V value) {
         cache.putIfAbsent(key, value);
     }
 
@@ -139,7 +139,7 @@ public abstract class CaffeineTbTransactionalCache<K extends Serializable, V ext
         }
     }
 
-    public boolean commit(UUID trId, Map<Object, Object> pendingPuts) {
+    public boolean commit(UUID trId, Map<K, V> pendingPuts) {
         lock.lock();
         try {
             var tr = transactions.get(trId);
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 a1f85611a7..86849586cc 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
@@ -53,7 +53,7 @@ public abstract class VersionedCaffeineTbCache<K extends Serializable, V extends
             TbPair<Long, V> versionValuePair = doGet(key);
             if (versionValuePair == null || version > versionValuePair.getFirst()) {
                 failAllTransactionsByKey(key);
-                cache.put(key, TbPair.of(version, value));
+                cache.put(key, wrapValue(value, version));
             }
         } finally {
             lock.unlock();
@@ -84,4 +84,13 @@ public abstract class VersionedCaffeineTbCache<K extends Serializable, V extends
         put(key, null, version);
     }
 
+    @Override
+    void doPutIfAbsent(K key, V value) {
+        cache.putIfAbsent(key, wrapValue(value, value != null ? value.getVersion() : 0));
+    }
+
+    private TbPair<Long, V> wrapValue(V value, Long version) {
+        return TbPair.of(version, value);
+    }
+
 }
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 b7722f90fd..bfb19ad01a 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
@@ -28,7 +28,6 @@ import org.thingsboard.server.common.data.HasVersion;
 
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Collection;
 
 @Slf4j
 public abstract class VersionedRedisTbCache<K extends Serializable, V extends Serializable & HasVersion> extends RedisTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
@@ -156,11 +155,6 @@ public abstract class VersionedRedisTbCache<K extends Serializable, V extends Se
         throw new NotImplementedException("putIfAbsent is not supported by versioned cache");
     }
 
-    @Override
-    public void evict(Collection<K> keys) {
-        throw new NotImplementedException("evict by many keys is not supported by versioned cache");
-    }
-
     @Override
     public void evictOrPut(K key, V value) {
         throw new NotImplementedException("evictOrPut is not supported by versioned cache");
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 8fcfcff8d7..4d600bd363 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
@@ -18,17 +18,32 @@ package org.thingsboard.server.cache;
 import org.thingsboard.server.common.data.HasVersion;
 
 import java.io.Serializable;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public interface VersionedTbCache<K extends Serializable, V extends Serializable & HasVersion> extends TbTransactionalCache<K, V> {
 
     TbCacheValueWrapper<V> get(K key);
 
+    default V get(K key, Supplier<V> supplier) {
+        return Optional.ofNullable(get(key))
+                .map(TbCacheValueWrapper::get)
+                .orElseGet(() -> {
+                    V value = supplier.get();
+                    put(key, value);
+                    return value;
+                });
+    }
+
     void put(K key, V value);
 
     void put(K key, V value, Long version);
 
     void evict(K key);
 
+    void evict(Collection<K> keys);
+
     void evict(K key, Long version);
 
 }