1 files changed, 3 insertions, 2 deletions

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 255c6168dd..7ec55bc1be 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -118,7 +118,8 @@ class Cache:
 
         self.cacheclean = False
         result = bb.data.getVar(var, self.data, exp)
-        self.depends_cache[fn][var] = result
+        if result is not None:
+            self.depends_cache[fn][var] = result
         return result
 
     def setData(self, virtualfn, fn, data):
@@ -219,7 +220,6 @@ class Cache:
                 virtuals += 1
         return False, skipped, virtuals
 
-
     def cacheValid(self, fn):
         """
         Is the cache valid for fn?
@@ -346,6 +346,7 @@ class Cache:
 
         p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
         p.dump([cache_data, version_data])
+        del self.depends_cache
 
     def mtime(self, cachefile):
         return bb.parse.cached_mtime_noerror(cachefile)