diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
old mode 100644
new mode 100755
index d72361a9508..9a19bd4679f
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
@@ -46,6 +46,7 @@ public class DevToolsPropertyDefaultsPostProcessor implements EnvironmentPostPro
 		properties.put("spring.mustache.cache", "false");
 		properties.put("server.session.persistent", "true");
 		properties.put("spring.h2.console.enabled", "true");
+		properties.put("spring.resources.cache-period", "0");
 		PROPERTIES = Collections.unmodifiableMap(properties);
 	}
 
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
old mode 100644
new mode 100755
index 4d7b6bf9f45..3b0de6383af
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -28,6 +28,7 @@ import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.ResourceProperties;
 import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
 import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
 import org.springframework.boot.devtools.filewatch.ChangedFiles;
@@ -89,6 +90,13 @@ public class LocalDevToolsAutoConfigurationTests {
 		assertThat(resolver.isCacheable(), equalTo(false));
 	}
 
+	@Test
+	public void resourceCachePeriodIsZero() throws Exception {
+		this.context = initializeAndRun(WebResourcesConfig.class);
+		ResourceProperties properties = this.context.getBean(ResourceProperties.class);
+		assertThat(properties.getCachePeriod(), equalTo(0));
+	}
+
 	@Test
 	public void liveReloadServer() throws Exception {
 		this.context = initializeAndRun(Config.class);
@@ -242,4 +250,9 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	}
 
+	@Configuration
+	@Import({ LocalDevToolsAutoConfiguration.class, ResourceProperties.class })
+	public static class WebResourcesConfig {
+
+	}
 }