Refactoring Cached
Merge remote-tracking branch 'baloo/improvements/2058-Cached'