revert 5cbce87359a2980c12b0b163a95ad94ed3c4fdd6
cache type-matchers