Merge pull request #267 from olegabr/feature-CacheProviderImprovement

Problems with cache providers are solved