Merge pull request #1715 from apache/tristan/light-cache-keys-without-sandbox-run

Lightweight cache keys when not running the sandbox