diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index b99fa99cfb..318781ba9b 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -43,7 +43,7 @@ except ImportError:
     logger.info("Importing cPickle failed. "
                 "Falling back to a very slow implementation.")
 
-__cache_version__ = "146"
+__cache_version__ = "147"
 
 def getCacheFile(path, filename, data_hash):
     return os.path.join(path, filename + "." + data_hash)
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 79bf331082..71b67e458f 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -96,10 +96,9 @@ class VariableParse:
                     raise Exception("variable %s references itself!" % self.varname)
             if key in self.d.expand_cache:
                 varparse = self.d.expand_cache[key]
-                self.references |= varparse.references
-                self.execs |= varparse.execs
-                return varparse.value
-            var = self.d.getVar(key, True)
+                var = varparse.value
+            else:
+                var = self.d.getVar(key, True)
             self.references.add(key)
             if var is not None:
                 return var