Move Geocoder object to container. Resolves #1