* Re-implement the message caches for r35821