Remove commented out method.
Only update location cache if general location changed.

Also, save a lot more locations, since they're more
interesting now.