Cleaned and updated cache system.  Now works entirely in CacheManager object, and automatically cleans out expired data based on the passed timeout variable.