diff --git a/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java b/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
index 8a653d058..c241f53e4 100644
--- a/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
+++ b/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
@@ -542,14 +542,15 @@ public abstract class AbstractCacheMap<K, V> implements Cache<K, V> {
 
     @Override
     public V computeIfAbsent(K key, Function<? super K, ? extends V> mappingFunction) {
-        AtomicReference<V> result = new AtomicReference<>();
-        map.computeIfAbsent(key, k -> {
+        CachedValue<K, V> v = map.computeIfAbsent(key, k -> {
             V value = mappingFunction.apply(k);
-            result.set(value);
             CachedValue<K, V> entry = create(key, value, timeToLiveInMillis, maxIdleInMillis);
             return entry;
         });
-        return result.get();
+        if (v != null) {
+            return v.getValue();
+        }
+        return null;
     }
 
 }