Cache location / object refactor