changed message caching
changed message caching