Correct geocode cache format and retrieval/mapping