Fix cache flush - now all 7096 existing tests pass