adding cache layer, not working yet
added geocode_station_files stub
Merge remote-tracking branch 'upstream/master'