Merge branch '1.3.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -248,6 +248,7 @@ public class ThymeleafAutoConfiguration {
 			// This resolver acts as a fallback resolver (e.g. like a
 			// InternalResourceViewResolver) so it needs to have low precedence
 			resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 5);
+			resolver.setCache(this.properties.isCache());
 			return resolver;
 		}
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java

@@ -245,6 +245,18 @@ public class ThymeleafAutoConfigurationTests {
 				.isInstanceOf(GroupingStrategy.class);
 	}
 
+	@Test
+	public void cachingCanBeDisabled() {
+		this.context.register(ThymeleafAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(this.context, "spring.thymeleaf.cache:false");
+		this.context.refresh();
+		assertThat(this.context.getBean(ThymeleafViewResolver.class).isCache()).isFalse();
+		TemplateResolver templateResolver = this.context.getBean(TemplateResolver.class);
+		templateResolver.initialize();
+		assertThat(templateResolver.isCacheable()).isFalse();
+	}
+
 	@Configuration
 	@ImportAutoConfiguration({ ThymeleafAutoConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class })