Removed old code from cache class