Removed ID as a requirement for file caching
Removed RefreshCache
Added some more tests for cache/Store