[3.8] Update cache namespace strategy to avoid collisions