renamed AggregateStore to AggregateCache, rename refactoring