Improve flush performance

Change-Id: I28dd9cd9ddf8eaae80db2e2f4c691e9896a9b8d2