Added factory for enricher to make it thread safe(ish)