Bluz\Cache refactoring in progress