Fixed the caching of the aggregate metrics