diff --git a/lib/compiler/passes/generate-javascript.js b/lib/compiler/passes/generate-javascript.js
index 88bd0ed..5d5c384 100644
--- a/lib/compiler/passes/generate-javascript.js
+++ b/lib/compiler/passes/generate-javascript.js
@@ -644,12 +644,12 @@ module.exports = function(ast, options) {
     parts.push(indent2(code));
 
     if (options.cache) {
-      parts.push(indent2(generateCacheFooter('s0')));
+      parts.push(indent2(generateCacheFooter(s(0))));
     }
 
     parts.push([
       '',
-      '  return s0;',
+      '  return ' + s(0) + ';',
       '}'
     ].join('\n'));