Cached matchers should use the generic type. Remove unused import. (cleanup)