Refactored Cache system. 2 Tests are now working.