diff --git a/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/MapCache.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/MapCache.java
index 7c6ac704fc..6802734cdd 100644
--- a/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/MapCache.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/MapCache.java
@@ -107,11 +107,7 @@ public void clear() {
 
   @Override
   public V putIfAbsent(final K key, final V value) {
-    V oldValue = get(key);
-    if (oldValue == null) {
-      oldValue = put(key, value);
-    }
-    return oldValue;
+    return backend.asMap().putIfAbsent(key, value);
   }
 
   @Override