Mathers moved to separate folder
Implemented caching for matchers