identity cache fixes