diff --git a/.gitignore b/.gitignore
index 5499ca02..893910ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ target/
 .settings
 .project
 .classpath
+.idea/
 
diff --git a/pom.xml b/pom.xml
index 7c15f4d6..e1524d20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <authlete-java-common.version>4.20</authlete-java-common.version>
+        <authlete-java-common.version>4.23</authlete-java-common.version>
         <gson.version>2.10.1</gson.version>
         <nimbus.version>9.31</nimbus.version>
         <javax.api.version>2.1</javax.api.version>
@@ -151,15 +151,15 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-site-plugin</artifactId>
                         <configuration>
-                            <reportPlugins>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-javadoc-plugin</artifactId>
-                                    <configuration>
-                                        <additionalparam>-Xdoclint:-html</additionalparam>
-                                    </configuration>
-                                </plugin>
-                            </reportPlugins>
+<!--                            <reportPlugins>-->
+<!--                                <plugin>-->
+<!--                                    <groupId>org.apache.maven.plugins</groupId>-->
+<!--                                    <artifactId>maven-javadoc-plugin</artifactId>-->
+<!--                                    <configuration>-->
+<!--                                        <additionalparam>-Xdoclint:-html</additionalparam>-->
+<!--                                    </configuration>-->
+<!--                                </plugin>-->
+<!--                            </reportPlugins>-->
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/src/main/java/com/authlete/jaxrs/api/AuthleteApiJaxrsImpl.java b/src/main/java/com/authlete/jaxrs/api/AuthleteApiJaxrsImpl.java
index 37b5b6ca..09a492e4 100644
--- a/src/main/java/com/authlete/jaxrs/api/AuthleteApiJaxrsImpl.java
+++ b/src/main/java/com/authlete/jaxrs/api/AuthleteApiJaxrsImpl.java
@@ -42,6 +42,7 @@
 import com.authlete.common.api.Options;
 import com.authlete.common.api.Settings;
 import com.authlete.common.conf.AuthleteConfiguration;
+import com.authlete.common.dto.ApiResponse;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JOSEObjectType;
 import com.nimbusds.jose.JWSAlgorithm;
@@ -428,7 +429,14 @@ protected <TResponse> TResponse callGetApi(
 
         setCustomRequestHeaders(builder, options);
 
-        return builder.get(responseClass);
+        Response httpResponse = builder.get();
+        TResponse apiResponseObject = httpResponse.readEntity(responseClass);
+
+        if (apiResponseObject instanceof ApiResponse) {
+            ((ApiResponse) apiResponseObject).setResponseHeaders(httpResponse.getStringHeaders());
+        }
+
+        return apiResponseObject;
     }
 
 
@@ -457,7 +465,14 @@ protected <TResponse> TResponse callPostApi(
 
         setCustomRequestHeaders(builder, options);
 
-        return builder.post(Entity.entity(request, JSON_UTF8_TYPE), responseClass);
+        Response httpResponse = builder.post(Entity.entity(request, JSON_UTF8_TYPE));
+
+        TResponse apiResponseObject = httpResponse.readEntity(responseClass);
+
+        if (apiResponseObject instanceof ApiResponse) {
+            ((ApiResponse) apiResponseObject).setResponseHeaders(httpResponse.getStringHeaders());
+        }
+        return apiResponseObject;
     }