More cache fixes.