WIP implementation of geocoder freezing.
Some minor bug fixes to the caching logic.
Tweaked the logic for neighbor match consolidation.