Minor cache fixes