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

This reverts commit 1eabbd46af1b2a120549c80b11feb29771519e3d.
CLC-3160 Testext test assumed inside-knowledge of cache implementation
Merge pull request #2616 from raydavis/raywip

CLC-3811 Revert previous PR & temporarily restore pseudo-user caching