Some random cache fixes.