[2.3] - Should fix a conflict in cache namespace partition

See #11329