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

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