Added back caching of prefix resolver, etc.

- performance returned.