quick fix on CacheProvider - tests to be validated!