Merge "messagecache: avoid caching message pages that do not override"