CC-5109 : Fix race-condition when updating cc_pref table