Merge "When deleting a path, remove it from the path cache. Bug #4170585"