Refactoring.
Implementing MRU cache strategy.