Cleaning up classes; up to CacheData.java