Fixing resource retrieval from server and from cache + changing the API of the api key resource.