More cache fixes