fix cache to include self.id
Merge branch 'cache-frozen-script' of github.com:code-dot-org/code-dot-org into cache-frozen-script