New report cache fixes