[Cache] Revert some changes merged made in 5.x branch

[Cache] Revert some changes merged made in 5.x branch #21260