Refactoring: updating cache internal model