Revert "Extract class God Class on Cache. Moved IO code"

This reverts commit 4f24c979025dd89186c86cbc872319ceb1d9bda2.
Re doing the last refactor I messed up