diff --git a/src/app/api/client.js b/src/app/api/client.js
index 910de5e..e6afc97 100644
--- a/src/app/api/client.js
+++ b/src/app/api/client.js
@@ -1,8 +1,21 @@
-import { create } from 'apisauce'
-
+import { create } from "apisauce";
+import { useCallback } from "react";
+import cache from "../utility/cache";
 
 const apiClient = create({
-  baseURL: 'https://wpd.brazilsouth.cloudapp.azure.com/api'
+  baseURL: "https://wpd.brazilsouth.cloudapp.azure.com/api",
 });
 
-export default apiClient;
\ No newline at end of file
+const get = apiClient.get;
+apiClient.get = async (url, params, axiosConfig) => {
+  const response = await get(url, params, axiosConfig);
+ 
+  if (response.ok) {
+    cache.store(url, response.data)
+    return response;
+  }
+  const data =  JSON.parse( await cache.get(url));
+  return data ? {ok:true, data} : undefined;
+};
+
+export default apiClient;
diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js
index 30de1c4..1e4df6c 100644
--- a/src/app/components/AssembleModalObject.js
+++ b/src/app/components/AssembleModalObject.js
@@ -145,7 +145,7 @@ async function getPluviometerStatio_informations(id) {
 }
 
 const AssembleModalObject = async (response, name, userId, formId) => {
-  
+
   var situation = null;
   var user = null;
   var institution = null;
diff --git a/src/app/components/MapModal.js b/src/app/components/MapModal.js
index 36fe6a6..840eca4 100644
--- a/src/app/components/MapModal.js
+++ b/src/app/components/MapModal.js
@@ -324,6 +324,7 @@ function MapModal({ showModal, setShowModal, markers }) {
           id,
           user
         );
+      //  console.log(result)
         if (result.data && showModal && currentMarker == undefined) {
           AssembleModalObject(
             JSON.stringify(result.data.responseData),
@@ -337,7 +338,7 @@ function MapModal({ showModal, setShowModal, markers }) {
       }
     }
   };
-
+  
   if (markers && showModal != null && markers.has(showModal)) {
     //currentMarker = markers.get(showModal);
     getAnswers(