diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index acf3968..ebd85fc 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -45,6 +45,11 @@
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
     </module>
+    <module name="SuppressWithPlainTextCommentFilter"> <!-- Suppression to prevent LineLength Check from flagging lines in Text-blocks -->
+        <property name="checkFormat" value="LineLength"/>
+        <property name="offCommentFormat" value="^.*&quot;&quot;&quot;\s*$"/>
+        <property name="onCommentFormat" value="^\s*&quot;&quot;&quot;\s*(?:[,;]|.+)$"/>
+    </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
         <module name="SuppressionCommentFilter">
@@ -407,7 +412,9 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
         </module>
-        <module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
+        <module name="JavadocStyle"><!-- Java Style Guide: Javadoc -->
+            <property name="checkFirstSentence" value="false"/>
+        </module>
         <module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
             <property name="offset" value="0"/>
         </module>
@@ -432,9 +439,6 @@
             <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
-            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
 
         <!-- Stricter checks end -->
     </module>
diff --git a/build.gradle b/build.gradle
index fe0bdac..f59dd6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.83.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.26.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.7.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.54.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.84.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.2.0'
         classpath 'com.palantir.gradle.guide:gradle-guide:1.13.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'
diff --git a/gradle-incremental-configuration-cache/src/main/java/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java b/gradle-incremental-configuration-cache/src/main/java/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java
index 32b418a..e2c9a03 100644
--- a/gradle-incremental-configuration-cache/src/main/java/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java
+++ b/gradle-incremental-configuration-cache/src/main/java/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java
@@ -21,6 +21,7 @@
 import com.palantir.gradle.configcache.incremental.RunResult.Failure;
 import com.palantir.gradle.utils.circleciartifacts.ArtifactLocation;
 import com.palantir.gradle.utils.circleciartifacts.CircleCiArtifacts;
+import com.palantir.logsafe.Unsafe;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -56,6 +57,7 @@ public final void check() throws IOException {
         }
     }
 
+    @Unsafe
     private String errorMessage(String output) {
         try {
             String artifactPath = "configuration-cache-validation-report/validation-report.txt";