Merge "Fix a resource race bug in PathCache"