Working before refactoring for caching in MessageService