Move Cache class methods in a separate module