[BZ 1135629,1135603] remove CacheAggregator and more clean up

BaseAggregator has been renamed to DataAggregator. The remaining functionality
that is needed has been moved up into DataAggregator. PastDataAggregator still
inherits from it.