Fix aggregation errors in the fetcher.
Merge branch 'store-cache' into iow-testing