State cache fixes.