Fix of 1202 issue by using new write cache