Added caching for rollups