Replace caching terms enum with simpler one

This one is an inner class inside the suggester and very much only works
there.  It won't work at all in other places.