Refactor cached reports