Addign cache key stuff

Change-Id: I52d5f5b333183da14a4f12cecbe932b55058a598