Refactored away CacheFacade and compacted handling of the cache/repository