Some minor changes, now caches web points/map