CLC-3811 Simplify cache keys for more realistic QA
CLC-3160 Remove misleading "user/" prefix from cache keys
This led to developer confusion & unnecessary code. Never underestimate the power of naming!
CLC-3160 Eliminate unneeded cache-key methods
Merge pull request #2610 from raydavis/raywip

CLC-3811 CLC-3160 Simplify caching behavior & keys