[1418] Cached report refactor