[1418] Cached report refactor - Fix for lots of tests.