CDB-2641 Improve geocoder cache by using an upsert
Merge CDB-2641 into release/2.13.2