Should fix a conflict in cache namespace partition

See #11329
Fixes a conflict in cache namespace partition

* origin/pr/11345:
  Should fix a conflict in cache namespace partition