KNL-1280 fix for NPE in caching race condition

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