Refactoring
Message caching