diff --git a/apps/api/src/modules/analytics/application/queries/get-district-stats/get-district-stats.handler.ts b/apps/api/src/modules/analytics/application/queries/get-district-stats/get-district-stats.handler.ts
index 9049b73..5c91a70 100644
--- a/apps/api/src/modules/analytics/application/queries/get-district-stats/get-district-stats.handler.ts
+++ b/apps/api/src/modules/analytics/application/queries/get-district-stats/get-district-stats.handler.ts
@@ -30,7 +30,7 @@ export class GetDistrictStatsHandler implements IQueryHandler<GetDistrictStatsQu
         const districts = await this.marketIndexRepo.getDistrictStats(query.city, query.period);
         return { city: query.city, period: query.period, districts };
       },
-      CacheTTL.MARKET_DATA,
+      CacheTTL.DISTRICT_STATS,
       'district_stats',
     );
   }
diff --git a/apps/api/src/modules/analytics/application/queries/get-heatmap/get-heatmap.handler.ts b/apps/api/src/modules/analytics/application/queries/get-heatmap/get-heatmap.handler.ts
index 23a5e71..039d407 100644
--- a/apps/api/src/modules/analytics/application/queries/get-heatmap/get-heatmap.handler.ts
+++ b/apps/api/src/modules/analytics/application/queries/get-heatmap/get-heatmap.handler.ts
@@ -30,7 +30,7 @@ export class GetHeatmapHandler implements IQueryHandler<GetHeatmapQuery> {
         const dataPoints = await this.marketIndexRepo.getHeatmap(query.city, query.period);
         return { city: query.city, period: query.period, dataPoints };
       },
-      CacheTTL.MARKET_DATA,
+      CacheTTL.HEATMAP,
       'heatmap',
     );
   }
diff --git a/apps/api/src/modules/analytics/application/queries/get-market-report/get-market-report.handler.ts b/apps/api/src/modules/analytics/application/queries/get-market-report/get-market-report.handler.ts
index 0dedecc..7a9bc38 100644
--- a/apps/api/src/modules/analytics/application/queries/get-market-report/get-market-report.handler.ts
+++ b/apps/api/src/modules/analytics/application/queries/get-market-report/get-market-report.handler.ts
@@ -34,7 +34,7 @@ export class GetMarketReportHandler implements IQueryHandler<GetMarketReportQuer
         );
         return { city: query.city, period: query.period, districts };
       },
-      CacheTTL.MARKET_DATA,
+      CacheTTL.MARKET_REPORT,
       'market_report',
     );
   }
diff --git a/apps/api/src/modules/shared/infrastructure/cache.service.ts b/apps/api/src/modules/shared/infrastructure/cache.service.ts
index 597fe96..8651563 100644
--- a/apps/api/src/modules/shared/infrastructure/cache.service.ts
+++ b/apps/api/src/modules/shared/infrastructure/cache.service.ts
@@ -12,7 +12,13 @@ export enum CacheTTL {
   LISTING_DETAIL = 300, // 5 min
   /** Search results — short TTL due to high variability */
   SEARCH_RESULTS = 60, // 1 min
-  /** Market analytics — long TTL, data changes infrequently */
+  /** District stats — moderate TTL, invalidated on listing events */
+  DISTRICT_STATS = 300, // 5 min
+  /** Market report — moderate TTL, invalidated on listing events */
+  MARKET_REPORT = 900, // 15 min
+  /** Heatmap data — moderate TTL, invalidated on listing events */
+  HEATMAP = 300, // 5 min
+  /** Price trend — long TTL, historical data changes infrequently */
   MARKET_DATA = 1800, // 30 min
   /** User profile — moderate TTL, invalidated on mutation */
   USER_PROFILE = 600, // 10 min
@@ -21,6 +27,7 @@ export enum CacheTTL {
 export enum CachePrefix {
   LISTING = 'cache:listing',
   SEARCH = 'cache:search',
+  GEO_SEARCH = 'cache:geo_search',
   MARKET_REPORT = 'cache:market:report',
   MARKET_TREND = 'cache:market:trend',
   MARKET_HEATMAP = 'cache:market:heatmap',