Merge "messagecache: use MergeableUpdate for the deferred replace() update"