diff --git a/core/src/main/java/org/elasticsearch/common/cache/Cache.java b/core/src/main/java/org/elasticsearch/common/cache/Cache.java
index e0fbfc815ca..b189368311e 100644
--- a/core/src/main/java/org/elasticsearch/common/cache/Cache.java
+++ b/core/src/main/java/org/elasticsearch/common/cache/Cache.java
@@ -307,9 +307,9 @@ public class Cache<K, V> {
                     } catch (Exception e) {
                         throw new ExecutionException(e);
                     }
-                }
-                if (value != null) {
-                    put(key, value, now);
+                    if (value != null) {
+                        put(key, value, now);
+                    }
                 }
             }
         }