diff --git a/build.gradle b/build.gradle
index 274d0a3d..d95ee519 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@
  * Copyright (c) 2016 oEmbedler Inc. and Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
- *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
- *  persons to whom the Software is furnished to do so, subject to the following conditions:
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
@@ -51,7 +51,7 @@ subprojects {
     group  "$PROJECT_GROUP"
 
     repositories {
-//        mavenLocal()
+        mavenLocal()
         mavenCentral()
         jcenter()
         maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" }
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java
index 14fdb181..e7a58551 100644
--- a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java
+++ b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java
@@ -38,6 +38,7 @@
 import graphql.kickstart.servlet.AbstractGraphQLHttpServlet;
 import graphql.kickstart.servlet.GraphQLConfiguration;
 import graphql.kickstart.servlet.GraphQLHttpServlet;
+import graphql.kickstart.servlet.cache.GraphQLResponseCacheManager;
 import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
 import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
@@ -130,6 +131,9 @@ public class GraphQLWebAutoConfiguration {
   @Autowired(required = false)
   private BatchInputPreProcessor batchInputPreProcessor;
 
+  @Autowired(required = false)
+  private GraphQLResponseCacheManager responseCacheManager;
+
   @PostConstruct
   void postConstruct() {
     if (errorHandler != null) {
@@ -284,6 +288,7 @@ public GraphQLConfiguration graphQLServletConfiguration(GraphQLInvocationInputFa
         .with(graphQLServletProperties.getSubscriptionTimeout())
         .with(batchInputPreProcessor)
         .with(graphQLServletProperties.getContextSetting())
+        .with(responseCacheManager)
         .build();
   }