Use a cache collector for token module info

Early testing shows that this saves about 5-6MB of memory on a site with a bunch but not huge amount of fields, I've seen token info caches that are a lot bigger.

Merging.

Automatically closed - issue fixed for 2 weeks with no activity.