diff --git a/databricks-sdk-java/pom.xml b/databricks-sdk-java/pom.xml
index 6a4be42aa..0dd508a7d 100644
--- a/databricks-sdk-java/pom.xml
+++ b/databricks-sdk-java/pom.xml
@@ -11,7 +11,7 @@
   <name>Databricks SDK for Java</name>
   <properties>
     <httpclient.version>4.5.14</httpclient.version>
-    <jackson.version>2.15.2</jackson.version>
+    <jackson.version>2.18.6</jackson.version>
     <junit-bom.version>5.10.0</junit-bom.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -110,6 +110,12 @@
       <artifactId>jackson-datatype-guava</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <!-- Jackson JDK8 module needed to serialize/deserialize java.util.Optional -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
     <!-- Google Auto Value -->
     <dependency>
       <groupId>com.google.auto.value</groupId>
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/SerDeUtils.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/SerDeUtils.java
index d7c204b0b..7cad48514 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/SerDeUtils.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/utils/SerDeUtils.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 /** Utilities for serialization and deserialization in the Databricks Java SDK. */
@@ -16,6 +17,7 @@ public static ObjectMapper createMapper() {
     mapper
         .registerModule(new JavaTimeModule())
         .registerModule(new GuavaModule())
+        .registerModule(new Jdk8Module())
         .registerModule(new ProtobufModule())
         .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
         .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)