CLC-3468 Fix bad cache overwrite by Sakai user ID
Merge pull request #2289 from raydavis/raywip

CLC-3468 Fix bad cache overwrite by Sakai user ID