Merge "msm: restart: flush the cache before restart"