Second God class refactor for cache class