Changed CacheServices constructor, updated tests.