Fix some group cache bugs