Fix the message overflow cache to work perfectly