Move user specific data so not cached

Retrieve cached data then add current location