Update cache namespace strategy to avoid collisions
Merge pull request #949 from romainneutron/cache-namespace-strategy

[3.8] Update cache namespace strategy to avoid collisions
Merge branch '3.8'