Merge "Make MessageCache use the immutable text cache during cache rebuilds"