KNL-1162 Fixes and adjustments for the MultiRefCache (deprecated)

git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@307996 66ffb92e-73f9-0310-93c1-f5514f145a0a