am e0a2435c: Merge "Properly account for created paths in the cache" into klp-dev

* commit 'e0a2435cb390c4333e3d40ede4d163566d779962':
  Properly account for created paths in the cache