Revert "CLC-3811 Simplify cache keys for more realistic QA"

This reverts commit 1eabbd46af1b2a120549c80b11feb29771519e3d.