fixed cached pair issues