Merge "Fixed race condition in MessageCache::replace"