Improve cache concurrency
Merge pull request #1015 from emmanuel-keller/1.5

Improve cache concurrency