CLC-3811 Simplify cache keys for more realistic QA

https://jira.ets.berkeley.edu/jira/browse/CLC-3811