Move user specific data so not cached

Retrieve cached data then add current location
Merge pull request #70 from joshuablake/individual_caching

Move user specific data so not cached