diff --git a/src/market/MarketOrderHistory.ts b/src/market/MarketOrderHistory.ts
deleted file mode 100644
index 3fffd5e..0000000
--- a/src/market/MarketOrderHistory.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { esiAxiosInstance } from "@/service";
-
-
-export type MarketOrderHistory = {
-    average: number;
-    date: string;
-    highest: number;
-    lowest: number;
-    order_count: number;
-    volume: number;
-}
-
-export const getHistory = async (regionId: number, tyeId: number): Promise<MarketOrderHistory[]> => (await esiAxiosInstance.get(`/markets/${regionId}/history/`, { params: { type_id: tyeId } })).data;
diff --git a/src/market/acquisition/AcquisitionQuantilsTooltip.vue b/src/market/acquisition/AcquisitionQuantilsTooltip.vue
index 42e33fc..4227a28 100644
--- a/src/market/acquisition/AcquisitionQuantilsTooltip.vue
+++ b/src/market/acquisition/AcquisitionQuantilsTooltip.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { LoadingSpinner, Tooltip } from '@/components';
 import { formatIsk } from '@/formaters';
-import { getHistory, jitaId } from '@/market';
-import { getHistoryQuartils } from '@/market/tracking';
+import { getHistory, getHistoryQuartils, jitaId } from '@/market';
 import { ArrowTrendingDownIcon, ArrowTrendingUpIcon } from '@heroicons/vue/24/outline';
 import { computedAsync } from '@vueuse/core';
 import { ref, watchEffect } from 'vue';
diff --git a/src/market/history/EsiMarketOrderHistory.ts b/src/market/history/EsiMarketOrderHistory.ts
new file mode 100644
index 0000000..edc6c1f
--- /dev/null
+++ b/src/market/history/EsiMarketOrderHistory.ts
@@ -0,0 +1,26 @@
+import { esiAxiosInstance } from "@/service";
+
+
+export type EsiMarketOrderHistory = {
+    average: number;
+    date: string;
+    highest: number;
+    lowest: number;
+    order_count: number;
+    volume: number;
+}
+
+// TODO use pinia store
+const historyCache: { [key: number]: { [key: number]: EsiMarketOrderHistory[] } } = {};
+
+export const getHistory = async (regionId: number, tyeId: number): Promise<EsiMarketOrderHistory[]> => {
+    if (historyCache[regionId]?.[tyeId]) {
+        return historyCache[regionId][tyeId];
+    }
+
+    const value = (await esiAxiosInstance.get(`/markets/${regionId}/history/`, { params: { type_id: tyeId } })).data;
+
+    historyCache[regionId] = historyCache[regionId] ?? {};
+    historyCache[regionId][tyeId] = value;
+    return value;
+}
diff --git a/src/market/tracking/HistoryQuartils.ts b/src/market/history/HistoryQuartils.ts
similarity index 85%
rename from src/market/tracking/HistoryQuartils.ts
rename to src/market/history/HistoryQuartils.ts
index d7f6872..d1cfcd9 100644
--- a/src/market/tracking/HistoryQuartils.ts
+++ b/src/market/history/HistoryQuartils.ts
@@ -1,4 +1,4 @@
-import { MarketOrderHistory } from "@/market";
+import { EsiMarketOrderHistory } from "@/market";
 
 export type HistoryQuartils = {
     totalVolume: number,
@@ -7,7 +7,7 @@ export type HistoryQuartils = {
     q3: number,
 }
 
-export const getHistoryQuartils = (history: MarketOrderHistory[], days?: number): HistoryQuartils => {
+export const getHistoryQuartils = (history: EsiMarketOrderHistory[], days?: number): HistoryQuartils => {
     const now = Date.now();
 
     const volumes = history
@@ -51,7 +51,7 @@ export const getHistoryQuartils = (history: MarketOrderHistory[], days?: number)
     };
 }
 
-const estimateVolume = (history: MarketOrderHistory): number => {
+const estimateVolume = (history: EsiMarketOrderHistory): number => {
     if (history.volume === 0) {
         return 0;
     }
diff --git a/src/market/history/index.ts b/src/market/history/index.ts
new file mode 100644
index 0000000..c035bba
--- /dev/null
+++ b/src/market/history/index.ts
@@ -0,0 +1,2 @@
+export * from './EsiMarketOrderHistory';
+export * from './HistoryQuartils';
diff --git a/src/market/index.ts b/src/market/index.ts
index 7af412b..1a2fedc 100644
--- a/src/market/index.ts
+++ b/src/market/index.ts
@@ -1,7 +1,7 @@
+export * from './history';
 export * from './tax';
 export * from './type';
 
-export * from './MarketOrderHistory';
 export * from './appraisal';
 export * from './market';
 
diff --git a/src/market/tracking/TrackingResultTable.vue b/src/market/tracking/TrackingResultTable.vue
index 57087b5..e2f8aa1 100644
--- a/src/market/tracking/TrackingResultTable.vue
+++ b/src/market/tracking/TrackingResultTable.vue
@@ -2,11 +2,10 @@
 import { SliderCheckbox } from '@/components';
 import { SortableHeader, useSort, VirtualScrollTable } from '@/components/table';
 import { formatIsk, percentFormater } from '@/formaters';
-import { MarketType, MarketTypeLabel, TaxInput, useMarketTaxStore } from "@/market";
+import { getHistoryQuartils, MarketType, MarketTypeLabel, TaxInput, useMarketTaxStore } from "@/market";
 import { BookmarkSlashIcon, ShoppingCartIcon } from '@heroicons/vue/24/outline';
 import { useStorage } from '@vueuse/core';
 import { computed, ref } from 'vue';
-import { getHistoryQuartils } from './HistoryQuartils';
 import { TrackingResult } from './tracking';
 
 type Result = {
@@ -163,4 +162,4 @@ const getLineColor = (result: Result) => {
 div.end {
     @apply justify-self-end ms-2;
 }
-</style>
\ No newline at end of file
+</style>../history/HistoryQuartils
\ No newline at end of file
diff --git a/src/market/tracking/index.ts b/src/market/tracking/index.ts
index 910e701..39b6918 100644
--- a/src/market/tracking/index.ts
+++ b/src/market/tracking/index.ts
@@ -1,4 +1,3 @@
-export * from './HistoryQuartils';
 export * from './tracking';
 
 export { default as TrackingResultTable } from './TrackingResultTable.vue';
diff --git a/src/market/tracking/tracking.ts b/src/market/tracking/tracking.ts
index 831bc63..600cad3 100644
--- a/src/market/tracking/tracking.ts
+++ b/src/market/tracking/tracking.ts
@@ -1,12 +1,12 @@
 import { marbasAxiosInstance, MarbasObject } from "@/marbas";
-import { getHistory, jitaId, MarketOrderHistory, MarketType, MarketTypePrice } from "@/market";
+import { EsiMarketOrderHistory, getHistory, jitaId, MarketType, MarketTypePrice } from "@/market";
 import log from "loglevel";
 import { defineStore } from "pinia";
 import { computed, ref } from "vue";
 
 export type TrackingResult = {
     type: MarketType;
-    history: MarketOrderHistory[];
+    history: EsiMarketOrderHistory[];
     buy: number,
     sell: number,
     orderCount: number,