Merge branch '4.0.x' into 4.1.x

Closes gh-51113

Author: snicoll

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/caching.adoc

@@ -284,7 +284,7 @@ Doing so makes sure that caching is not required by slice tests.
 For tests that enable a full context, such as javadoc:org.springframework.boot.test.context.SpringBootTest[format=annotation], an explicit configuration overriding the regular configuration is required.
 
 If caching is auto-configured, more options are available.
-Tests can be annotated with javadoc:org.springframework.boot.test.autoconfigure.core.AutoConfigureCache[format=annotation] to replace the auto-configured javadoc:org.springframework.cache.CacheManager[] by a no-op implementation.
+Tests can be annotated with javadoc:org.springframework.boot.cache.test.autoconfigure.AutoConfigureCache[format=annotation] to replace the auto-configured javadoc:org.springframework.cache.CacheManager[] by a no-op implementation.
 
 include-code::MyIntegrationTests[]