diff --git a/src/components/AreaCoordinates/AreaCoordinates.tsx b/src/components/AreaCoordinates/AreaCoordinates.tsx
index 1c182956..6f36357b 100644
--- a/src/components/AreaCoordinates/AreaCoordinates.tsx
+++ b/src/components/AreaCoordinates/AreaCoordinates.tsx
@@ -19,6 +19,8 @@ import {
   UpdateAnalogueModelAreaCommandForm,
 } from '../../api/generated';
 import { AnalogueModelsService } from '../../api/generated/services/AnalogueModelsService';
+import { queryClient } from '../../auth/queryClient';
+import { useFetchModel } from '../../hooks/useFetchModel';
 import * as Styled from './AreaCoordinates.styled';
 import { CoordinateInput } from './CoordinateInput/CoordinateInput';
 
@@ -61,7 +63,6 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
   const [showSaveAlert, setSaveAlert] = useState(false);
   const [activeArea, setActiveArea] = useState<ModelAreaTypeDto>(defaultArea);
   const [newArea, setNewArea] = useState<ModelAreaTypeDto>();
-  const [updated, setUpdated] = useState(1);
   const [errors, setErrors] = useState<ErrorType>({});
   const [submitting, setSubmitting] = useState(false);
   const [areaCoordinate, setAreaCoordinate] = useState<AreaCoordinateType>({
@@ -88,10 +89,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
     return isNaN(value);
   }
 
-  const model = useQuery({
-    queryKey: ['analogue-model', modelId, updated],
-    queryFn: () => AnalogueModelsService.getApiAnalogueModels1(modelId),
-  });
+  const { data, isLoading } = useFetchModel(modelId);
 
   const modelAreas = useQuery({
     queryKey: ['model-area'],
@@ -111,6 +109,9 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
         requestBody,
       );
     },
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['analogue-model'] });
+    },
   });
 
   const putAreaCoordinates = useMutation({
@@ -129,6 +130,9 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
         requestBody,
       );
     },
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['analogue-model'] });
+    },
   });
 
   const handleSelectChange = async (
@@ -160,8 +164,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
       return;
     }
 
-    const selectableAreas =
-      model.data?.data?.modelAreas && model.data?.data?.modelAreas;
+    const selectableAreas = data?.data?.modelAreas && data?.data?.modelAreas;
 
     const selectedArea = selectableAreas?.filter(
       (area) => area.modelAreaType === changes.selectedItems[0].name,
@@ -298,7 +301,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
     return errors;
   };
 
-  const clearAndUpdate = () => {
+  const clearAndUpdate = async () => {
     setActiveArea(defaultArea);
     setAreaCoordinate({
       modelAreaId: '',
@@ -315,8 +318,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
         },
       ],
     });
-    setUpdated(updated + 1);
-    setSaveAlert(true);
+    return 'success';
   };
 
   const postModelArea = async () => {
@@ -332,7 +334,8 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
       });
 
       if (coordinateRes.success) {
-        clearAndUpdate();
+        const res = await clearAndUpdate();
+        if (res === 'success') setSaveAlert(true);
       }
     }
   };
@@ -344,7 +347,8 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
       requestBody: { coordinates: areaCoordinate.coordinates },
     });
     if (coordinateRes.success) {
-      clearAndUpdate();
+      const res = await clearAndUpdate();
+      if (res === 'success') setSaveAlert(true);
     }
   };
 
@@ -383,7 +387,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [errors, submitting]);
 
-  if (modelAreas.isLoading || modelAreas.data === undefined || model.isLoading)
+  if (modelAreas.isLoading || modelAreas.data === undefined || isLoading)
     return <p>Loading.....</p>;
 
   return (
@@ -393,7 +397,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
         <Styled.Form>
           <Styled.Info>
             <Typography variant="h6">
-              {model.data?.success && model.data.data.name}
+              {data?.success && data.data.name}
             </Typography>
             <Typography variant="body_long">
               Select from predefined model areas and set the X/Y coordinates for
@@ -407,6 +411,7 @@ export const AreaCoordinates = ({ modelId }: { modelId: string }) => {
               options={modelAreas.data.data}
               optionLabel={(option) => option.name}
               onOptionsChange={handleSelectChange}
+              selectedOptions={[activeArea]}
               variant={errors.area ? 'error' : undefined}
             ></Autocomplete>
           </Styled.CoordinateGroup>
diff --git a/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx b/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
index e1fd58ee..98d16581 100644
--- a/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
+++ b/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
@@ -1,12 +1,8 @@
 /* eslint-disable max-lines */
 /* eslint-disable max-depth */
 /* eslint-disable max-lines-per-function */
-import { useMsal } from '@azure/msal-react';
-import { useQuery } from '@tanstack/react-query';
 import { useCallback, useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
 import {
-  AnalogueModelsService,
   ComputeCaseDto,
   CreateComputeCaseCommandResponse,
   CreateComputeCaseInputSettingsForm,
@@ -17,7 +13,7 @@ import {
   ModelAreaDto,
   UpdateComputeCaseInputSettingsForm,
 } from '../../../../api/generated';
-import { useAccessToken } from '../../../../hooks/useAccessToken';
+import { useFetchModel } from '../../../../hooks/useFetchModel';
 import { CaseButtons } from '../CaseButtons/CaseButtons';
 import { ModelAreaSelect } from '../CaseSettingSelects/ModelAreaSelect';
 import { VariogramOptionSelect } from '../CaseSettingSelects/VariogramSettingSelect';
@@ -65,9 +61,6 @@ export const CaseRow = ({
     name: string,
   ) => ListComputeSettingsMethodDto[] | undefined;
 }) => {
-  const { modelId } = useParams<{ modelId: string }>();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
   const [selectedModelArea, setModelArea] = useState<ModelAreaDto[]>();
   const [selectedIndicatorParameters, setIndicatorParameters] =
     useState<ListComputeSettingsInputValueDto[]>();
@@ -82,12 +75,7 @@ export const CaseRow = ({
   const [saved, setSaved] = useState<boolean>(true);
   const [caseError, setCaseError] = useState<string>('');
 
-  const { data } = useQuery({
-    queryKey: ['analogue-model', modelId],
-    queryFn: () =>
-      AnalogueModelsService.getApiAnalogueModels1(modelId as string),
-    enabled: !!token,
-  });
+  const { data } = useFetchModel();
 
   const channelSettings = settingsFilter('Object');
   const variogramSettings = settingsFilter('Variogram');
diff --git a/src/features/ModelTable/ModelTable.tsx b/src/features/ModelTable/ModelTable.tsx
index 626b1a02..7676f3d1 100644
--- a/src/features/ModelTable/ModelTable.tsx
+++ b/src/features/ModelTable/ModelTable.tsx
@@ -16,12 +16,10 @@ import { useAccessToken } from '../../hooks/useAccessToken';
 import * as Styled from './ModelTable.styled';
 
 export const ModelTable = ({
-  refetchKey,
   progress,
   activeUploadId,
   transforming,
 }: {
-  refetchKey: number;
   progress: number;
   activeUploadId: string;
   transforming: boolean;
@@ -34,7 +32,7 @@ export const ModelTable = ({
   const [toggle, setToggle] = useState<boolean>(false);
   const [activeModel, setActiveModel] = useState<string>();
   const { isLoading, data } = useQuery({
-    queryKey: ['analogue-models', refetchKey],
+    queryKey: ['analogue-models'],
     queryFn: () => AnalogueModelsService.getApiAnalogueModels(),
     enabled: !!token,
   });
diff --git a/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx b/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx
index 721ab034..c0d9704f 100644
--- a/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx
+++ b/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx
@@ -1,9 +1,7 @@
 /* eslint-disable max-lines-per-function */
-import { useMsal } from '@azure/msal-react';
 import { Button, Table, Typography } from '@equinor/eds-core-react';
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import { useState } from 'react';
-import { useParams } from 'react-router-dom';
 import {
   AddAnalogueDto,
   AddAnalogueModelAnalogueCommandForm,
@@ -15,29 +13,18 @@ import {
   AnalogueModelMetadataService,
   AnalogueModelSourceType,
   MetadataDto,
-  OpenAPI,
   UpdateAnalogueModelCommandBody,
 } from '../../../api/generated';
 import { AnalogueModelsService } from '../../../api/generated/services/AnalogueModelsService';
-import { useAccessToken } from '../../../hooks/useAccessToken';
+import { queryClient } from '../../../auth/queryClient';
+import { useFetchModel } from '../../../hooks/useFetchModel';
 import { AddModelDialog } from '../../AddModel/AddModelDialog/AddModelDialog';
 import { TableDataCell } from '../TableDataCell/TableDataCell';
 import * as Styled from './ModelMetadataView.styled';
 
 export const ModelMetadataView = () => {
-  const { modelId } = useParams();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
-  if (token) OpenAPI.TOKEN = token;
-
   const [isAddModelDialog, setAddModelDialog] = useState<boolean>(false);
-  const [refetchKey, setRefetchKey] = useState<number>(0);
-  const { isLoading, data } = useQuery({
-    queryKey: ['analogue-model', modelId, refetchKey],
-    queryFn: () =>
-      AnalogueModelsService.getApiAnalogueModels1(modelId as string),
-    enabled: !!token,
-  });
+  const { isLoading, data } = useFetchModel();
 
   const defaultMetadata: AnalogueModelDetail = {
     analogueModelId: data?.data.analogueModelId
@@ -83,6 +70,9 @@ export const ModelMetadataView = () => {
         requestBody,
       );
     },
+    onSuccess: () => {
+      queryClient.refetchQueries();
+    },
   });
 
   const uploadModelAnalouges = useMutation({
@@ -98,6 +88,9 @@ export const ModelMetadataView = () => {
         requestBody,
       );
     },
+    onSuccess: () => {
+      queryClient.refetchQueries();
+    },
   });
 
   const metadataList: AddMetadataDto[] = [];
@@ -147,7 +140,6 @@ export const ModelMetadataView = () => {
       requestBody: readyAnalogue,
     });
 
-    setRefetchKey(refetchKey + 1);
     toggleDialog();
   };
 
diff --git a/src/features/ModelView/ModelSourceView/ModelSourceView.tsx b/src/features/ModelView/ModelSourceView/ModelSourceView.tsx
index 4c690f79..4cbd03f2 100644
--- a/src/features/ModelView/ModelSourceView/ModelSourceView.tsx
+++ b/src/features/ModelView/ModelSourceView/ModelSourceView.tsx
@@ -1,27 +1,10 @@
-import { useMsal } from '@azure/msal-react';
 import { Table, Typography } from '@equinor/eds-core-react';
-import { useQuery } from '@tanstack/react-query';
-import { useParams } from 'react-router-dom';
-import {
-  AnalogueModelsService,
-  OpenAPI,
-  UploadList,
-} from '../../../api/generated';
-import { useAccessToken } from '../../../hooks/useAccessToken';
+import { UploadList } from '../../../api/generated';
+import { useFetchModel } from '../../../hooks/useFetchModel';
 import * as Styled from './ModelSourceView.styled';
 
 export const ModelSourceView = () => {
-  const { modelId } = useParams();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
-  if (token) OpenAPI.TOKEN = token;
-
-  const { isLoading, data } = useQuery({
-    queryKey: ['analogue-model', modelId],
-    queryFn: () =>
-      AnalogueModelsService.getApiAnalogueModels1(modelId as string),
-    enabled: !!token,
-  });
+  const { isLoading, data } = useFetchModel();
 
   if (isLoading || !data?.success) return <p>Loading ...</p>;
 
diff --git a/src/hooks/useFetchCases.ts b/src/hooks/useFetchCases.ts
new file mode 100644
index 00000000..e578c77d
--- /dev/null
+++ b/src/hooks/useFetchCases.ts
@@ -0,0 +1,23 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { useMsal } from '@azure/msal-react';
+import { useParams } from 'react-router-dom';
+import { AnalogueModelComputeCasesService } from '../api/generated';
+import { useAccessToken } from './useAccessToken';
+
+export const useFetchCases = () => {
+  const { modelId } = useParams();
+  const { instance, accounts } = useMsal();
+  const token = useAccessToken(instance, accounts[0]);
+
+  const query = useQuery({
+    queryKey: ['model-cases', modelId],
+    queryFn: () =>
+      AnalogueModelComputeCasesService.getApiAnalogueModelsComputeCases(
+        modelId as string,
+      ),
+    enabled: !!token,
+  });
+
+  return query;
+};
diff --git a/src/hooks/useFetchModel.ts b/src/hooks/useFetchModel.ts
new file mode 100644
index 00000000..0476334d
--- /dev/null
+++ b/src/hooks/useFetchModel.ts
@@ -0,0 +1,22 @@
+import { useQuery } from '@tanstack/react-query';
+import { AnalogueModelsService } from '../api/generated/services/AnalogueModelsService';
+
+import { useMsal } from '@azure/msal-react';
+import { useParams } from 'react-router-dom';
+import { useAccessToken } from './useAccessToken';
+
+export const useFetchModel = (id?: string) => {
+  const { modelId } = useParams();
+  const { instance, accounts } = useMsal();
+  const token = useAccessToken(instance, accounts[0]);
+
+  const ID = id ? id : (modelId as string);
+
+  const query = useQuery({
+    queryKey: ['analogue-model', ID],
+    queryFn: () => AnalogueModelsService.getApiAnalogueModels1(ID),
+    enabled: !!token,
+  });
+
+  return query;
+};
diff --git a/src/pages/Browse/Browse.tsx b/src/pages/Browse/Browse.tsx
index 5ef6654d..cf9c5689 100644
--- a/src/pages/Browse/Browse.tsx
+++ b/src/pages/Browse/Browse.tsx
@@ -21,6 +21,7 @@ import {
   UploadFileType,
   UploadsService,
 } from '../../api/generated';
+import { queryClient } from '../../auth/queryClient';
 import { AddModelDialog } from '../../features/AddModel/AddModelDialog/AddModelDialog';
 import { ModelTable } from '../../features/ModelTable/ModelTable';
 import * as Styled from './Browse.styled';
@@ -48,7 +49,6 @@ export const Browse = () => {
   const [uploadId, setUploadId] = useState<string>('');
   const [isAddModelDialog, setAddModelDialog] = useState<boolean>(false);
   const [uploadStatus, setUploadStatus] = useState<string>();
-  const [refetch, setRefetch] = useState<number>(0);
   const [uploading, setUploading] = useState<boolean>(false);
   const [transforming, setTransforming] = useState<boolean>(false);
 
@@ -67,6 +67,9 @@ export const Browse = () => {
 
   const createModel = useMutation({
     mutationFn: AnalogueModelsService.postApiAnalogueModels,
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['analogue-models'] });
+    },
   });
 
   const modelManifest = useMutation({
@@ -79,6 +82,9 @@ export const Browse = () => {
 
   const uploadFinished = useMutation({
     mutationFn: UploadsService.postApiUploadsModelsComplete,
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['analogue-models'] });
+    },
   });
 
   const convertModelFile = useMutation({
@@ -180,7 +186,6 @@ export const Browse = () => {
     if (createModel.error === null && modelUpload.success) {
       const id = modelUpload.data.analogueModelId;
       setModelId(id);
-      setRefetch(refetch + 1);
       setProgress(1);
       uploadMetadata(id, metadata);
 
@@ -297,7 +302,6 @@ export const Browse = () => {
           <Button onClick={toggleDialog}>Add new model</Button>
         </div>
         <ModelTable
-          refetchKey={refetch}
           progress={progress}
           activeUploadId={modelId}
           transforming={transforming}
diff --git a/src/pages/ModelPages/Compute/ComputeObject/ComputeObject.tsx b/src/pages/ModelPages/Compute/ComputeObject/ComputeObject.tsx
index 8f30e5cd..41140f20 100644
--- a/src/pages/ModelPages/Compute/ComputeObject/ComputeObject.tsx
+++ b/src/pages/ModelPages/Compute/ComputeObject/ComputeObject.tsx
@@ -1,17 +1,13 @@
 /* eslint-disable max-lines-per-function */
-import { useMsal } from '@azure/msal-react';
 import { Snackbar } from '@equinor/eds-core-react';
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';
-import {
-  AnalogueModelComputeCasesService,
-  EstimateChannelCommand,
-  JobsService,
-} from '../../../../api/generated';
+import { EstimateChannelCommand, JobsService } from '../../../../api/generated';
+import { queryClient } from '../../../../auth/queryClient';
 import { CaseGroup } from '../../../../features/Compute/CaseGroup/CaseGroup';
 import { ComputeHeader } from '../../../../features/Compute/ComputeHeader/ComputeHeader';
-import { useAccessToken } from '../../../../hooks/useAccessToken';
+import { useFetchCases } from '../../../../hooks/useFetchCases';
 import * as Styled from '../Compute.styled';
 import { CaseInfoTyoe } from '../ComputeVariogram/ComputeVariogram';
 
@@ -24,11 +20,8 @@ const ObjectCaseInfo: CaseInfoTyoe = {
 };
 
 export const ComputeObject = () => {
-  const [refetchKey, setRefetchKey] = useState<number>(0);
   const [showAlert, setAlert] = useState<string>();
   const { modelId } = useParams<{ modelId: string }>();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
 
   function clearStatus() {
     setAlert(undefined);
@@ -37,21 +30,13 @@ export const ComputeObject = () => {
     setAlert(message);
   };
 
-  const uppdateCaseList = () => {
-    setRefetchKey(refetchKey + 1);
-  };
-
-  const { data } = useQuery({
-    queryKey: ['model-cases', modelId, refetchKey],
-    queryFn: () =>
-      AnalogueModelComputeCasesService.getApiAnalogueModelsComputeCases(
-        modelId as string,
-      ),
-    enabled: !!token,
-  });
+  const { data } = useFetchCases();
 
   const computeObject = useMutation({
     mutationFn: JobsService.postApiJobsComputeChannelEstimations,
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['model-cases'] });
+    },
   });
 
   const runComputeObject = async (computeCaseId: string) => {
@@ -64,7 +49,6 @@ export const ComputeObject = () => {
     const res = await computeObject.mutateAsync(requestBody);
 
     if (res.success) {
-      uppdateCaseList();
       setAlertMessage('Started computing case');
     }
   };
diff --git a/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx b/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx
index 51830afa..fea076de 100644
--- a/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx
+++ b/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx
@@ -1,14 +1,10 @@
 /* eslint-disable max-lines-per-function */
-import { useMsal } from '@azure/msal-react';
 import { Button, Icon, Snackbar, Tooltip } from '@equinor/eds-core-react';
 import { add as ADD, play as PLAY } from '@equinor/eds-icons';
-import { useQuery } from '@tanstack/react-query';
 import { useState } from 'react';
-import { useParams } from 'react-router-dom';
-import { AnalogueModelComputeCasesService } from '../../../../api/generated';
 import { CaseGroup } from '../../../../features/Compute/CaseGroup/CaseGroup';
 import { ComputeHeader } from '../../../../features/Compute/ComputeHeader/ComputeHeader';
-import { useAccessToken } from '../../../../hooks/useAccessToken';
+import { useFetchCases } from '../../../../hooks/useFetchCases';
 import * as Styled from '../Compute.styled';
 
 export interface CaseInfoTyoe {
@@ -28,9 +24,6 @@ const variogramCaseInfo: CaseInfoTyoe = {
 };
 
 export const ComputeVariogram = () => {
-  const { modelId } = useParams<{ modelId: string }>();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
   const [showAlert, setAlert] = useState<string>();
   const [triggerAddCase, setTriggerAddCase] = useState<string>();
   const [localCaseList, setLocalCaseList] = useState<Array<string>>([]);
@@ -51,14 +44,7 @@ export const ComputeVariogram = () => {
     setAlert(undefined);
   }
 
-  const { data } = useQuery({
-    queryKey: ['model-cases', modelId],
-    queryFn: () =>
-      AnalogueModelComputeCasesService.getApiAnalogueModelsComputeCases(
-        modelId as string,
-      ),
-    enabled: !!token,
-  });
+  const { data } = useFetchCases();
 
   const methodFilter = (name: string) => {
     return data?.data.filter((method) => method.computeMethod.name === name);
diff --git a/src/pages/ModelPages/Model/Model.tsx b/src/pages/ModelPages/Model/Model.tsx
index ee4c795e..4f143b4d 100644
--- a/src/pages/ModelPages/Model/Model.tsx
+++ b/src/pages/ModelPages/Model/Model.tsx
@@ -1,24 +1,11 @@
-import { useMsal } from '@azure/msal-react';
-import { useQuery } from '@tanstack/react-query';
-import { Outlet, useParams } from 'react-router-dom';
-import { AnalogueModelsService, OpenAPI } from '../../../api/generated';
+import { Outlet } from 'react-router-dom';
 import { ModelNameFrame } from '../../../features/ModelView/ModelNameFrame/ModelNameFrame';
 import { ModelNavigationBar } from '../../../features/ModelView/ModelNavigationBar/ModelNavigationBar';
-import { useAccessToken } from '../../../hooks/useAccessToken';
+import { useFetchModel } from '../../../hooks/useFetchModel';
 import * as Styled from './Model.styled';
 
 export const Model = () => {
-  const { modelId } = useParams<{ modelId: string }>();
-  const { instance, accounts } = useMsal();
-  const token = useAccessToken(instance, accounts[0]);
-  if (token) OpenAPI.TOKEN = token;
-
-  const { data } = useQuery({
-    queryKey: ['analogue-model', modelId],
-    queryFn: () =>
-      AnalogueModelsService.getApiAnalogueModels1(modelId as string),
-    enabled: !!token,
-  });
+  const { data } = useFetchModel();
 
   return (
     <>
diff --git a/src/pages/ModelPages/Results/Results.tsx b/src/pages/ModelPages/Results/Results.tsx
index e242dc0e..ed955e59 100644
--- a/src/pages/ModelPages/Results/Results.tsx
+++ b/src/pages/ModelPages/Results/Results.tsx
@@ -2,13 +2,11 @@
 import { useMsal } from '@azure/msal-react';
 import { useQuery } from '@tanstack/react-query';
 import { useParams } from 'react-router-dom';
-import {
-  AnalogueModelComputeCasesService,
-  AnalogueModelsService,
-} from '../../../api/generated';
+import { AnalogueModelsService } from '../../../api/generated';
 import { CaseResultView } from '../../../features/Results/CaseResult/CaseResultView/CaseResultView';
 import { NoResults } from '../../../features/Results/NoResults/NoResults';
 import { useAccessToken } from '../../../hooks/useAccessToken';
+import { useFetchCases } from '../../../hooks/useFetchCases';
 
 export interface VariogramResultListType {
   caseId: number;
@@ -39,14 +37,7 @@ export const Results = () => {
     enabled: !!token,
   });
 
-  const cases = useQuery({
-    queryKey: ['model-cases', modelId],
-    queryFn: () =>
-      AnalogueModelComputeCasesService.getApiAnalogueModelsComputeCases(
-        modelId as string,
-      ),
-    enabled: !!token,
-  });
+  const cases = useFetchCases();
 
   const objectResults = data?.filter((res) => res.resultType === 'Object');