diff --git a/NEWS.md b/NEWS.md
index 07ce7c4b..3337c27b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,8 @@
 ## 5.1.1
 Released yyyy-mm-dd
 
+Announcements:
+ - Upgrade windshaft to [4.3.3](https://github.com/CartoDB/windshaft/releases/tag/4.3.2) adding support for cache-features' in Mapnik/CartoDB layers.
 
 ## 5.1.0
 Released 2018-01-30
diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 55cda5ba..644fea48 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -204,7 +204,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 3904d46e..db18d93c 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -198,7 +198,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 15031991..b478ca80 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -198,7 +198,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 43ebf844..776166e5 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -197,7 +197,12 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
+
       },
       http: {
           timeout: 2000, // the timeout in ms for a http tile request
diff --git a/package.json b/package.json
index d1be2a7b..373e8f53 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.20.2",
     "underscore": "~1.6.0",
-    "windshaft": "4.3.1",
+    "windshaft": "4.3.3",
     "yargs": "~5.0.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 3b392300..23bb4e51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -867,9 +867,9 @@ graceful-fs@^4.1.2:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-grainstore@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.8.1.tgz#5a0f9ef35dedffb4a393d5339dffc2a8ae19a897"
+grainstore@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.8.2.tgz#79dd7a91a098bf8b0ea3189961775c8cc7474319"
   dependencies:
     carto "0.16.3"
     debug "~3.1.0"
@@ -1794,8 +1794,8 @@ raw-body@2.3.2:
     unpipe "1.0.0"
 
 rc@^1.1.7:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -2400,9 +2400,9 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-windshaft@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.3.1.tgz#fd012caaacb40de41e7a4e650d039fd9dc59af91"
+windshaft@4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.3.3.tgz#a48fdd6ca05257c103f34c80195722ef52dc0813"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.2"
     "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1
@@ -2412,7 +2412,7 @@ windshaft@4.3.1:
     cartodb-psql "^0.10.1"
     debug "^3.1.0"
     dot "~1.0.2"
-    grainstore "~1.8.1"
+    grainstore "1.8.2"
     queue-async "~1.0.7"
     redis-mpool "0.4.1"
     request "^2.83.0"