Updated caching for mentions
fixed conflicts