Added in the CacheMaster and some of the caching code, Does not yet compile due to bad statics