Move matcher to outside to avoid fatal error: concurrent map read and map write

Move matcher to outside to avoid fatal error: concurrent map read and map write #379