Fix matcher slowness due to loader invocation