Rewrite of internal message caching