diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
index 9379858d..0d0ecc3b 100644
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -49,11 +49,13 @@ var CartodbWindshaft = function(serverOptions) {
     //
     var template_baseurl = global.environment.base_url_templated || '(?:/maps/named|/tiles/template)';
 
-    serverOptions.signedMaps = new SignedMaps(redisPool);
+    var signedMaps = new SignedMaps(redisPool);
+
+    serverOptions.signedMaps = signedMaps;
     var templateMapsOpts = {
       max_user_templates: global.environment.maxUserTemplates
     };
-    var templateMaps = new TemplateMaps(redisPool, serverOptions.signedMaps, templateMapsOpts);
+    var templateMaps = new TemplateMaps(redisPool, signedMaps, templateMapsOpts);
 
     // boot
     var ws = new Windshaft.Server(serverOptions);