Merge pull request #553 from annando/osm-cache