am ce7fa780: Merge "Fix a resource race bug in PathCache"

* commit 'ce7fa780cdee2730b570cc34066f15c74d44e6ef':
  Fix a resource race bug in PathCache