added caching for geodata lookups
Merge remote-tracking branch 'udi/master'
fixed 1 location