Improved caching.


git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/SAK-28028@315626 66ffb92e-73f9-0310-93c1-f5514f145a0a