cache fixes; more consistent naming