[1418] Cached report refactor - One-liner.