cache fixes and provider limitations