KNL-1162 Removed deprecated methods, converted Cache to be closer to JSR-107, updated various methods to comply with the changes

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