diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
index ed39bf3716..d443307cb7 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
@@ -39,7 +39,7 @@ public abstract class RedisTbTransactionalCache<K extends Serializable, V extend
     @Getter
     private final String cacheName;
     private final RedisConnectionFactory connectionFactory;
-    private final RedisSerializer<String> keySerializer = new StringRedisSerializer();
+    private final RedisSerializer<String> keySerializer = StringRedisSerializer.UTF_8;
     private final RedisSerializer<V> valueSerializer;
     private final Expiration evictExpiration;
     private final Expiration cacheTtl;
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TbCaffeineCacheConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TbCaffeineCacheConfiguration.java
index 664eaa1fb4..9cb139e26a 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TbCaffeineCacheConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TbCaffeineCacheConfiguration.java
@@ -67,7 +67,7 @@ public class TbCaffeineCacheConfiguration {
         //SimpleCacheManager is not a bean (will be wrapped), so call initializeCaches manually
         manager.initializeCaches();
 
-        return new TransactionAwareCacheManagerProxy(manager);
+        return manager;
     }
 
     private CaffeineCache buildCache(String name, CacheSpecs cacheSpec) {
diff --git a/msa/vc-executor/src/main/resources/tb-vc-executor.yml b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
index 4e430e5ba6..a97c4cfd37 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -19,6 +19,8 @@ spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}"
 # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}"
 
+spring.main.allow-circular-references: "true"
+
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"