Added self caching
Added direct-mention-p and mention-p