Refactoring; Simple persistent cache provider added