cleanups and bugfix on loading cached data

fixed cached data having the timestamp data, where loading from network
wouldn't have timestamp data.

cleaned up some formatting issues and renamed some methods to be clearer