More bug fixes to the cache path.