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