Updated caching for mentions