Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev