diff --git a/backend/src/main/java/cx/flamingo/analysis/controller/HiringController.java b/backend/src/main/java/cx/flamingo/analysis/controller/HiringController.java
index 7433b2e..612ea57 100644
--- a/backend/src/main/java/cx/flamingo/analysis/controller/HiringController.java
+++ b/backend/src/main/java/cx/flamingo/analysis/controller/HiringController.java
@@ -1,14 +1,16 @@
 package cx.flamingo.analysis.controller;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cx.flamingo.analysis.model.JobOpening;
+import cx.flamingo.analysis.model.ApiResponse;
+import cx.flamingo.analysis.service.CacheService;
 import cx.flamingo.analysis.service.HiringService;
 import lombok.RequiredArgsConstructor;
 
@@ -18,19 +20,23 @@
 public class HiringController {
     
     private final HiringService hiringService;
+    private final CacheService cacheService;
 
     @GetMapping("/manager")
-    public Map<String, Object> getHiringManagerProfile() {
-        return hiringService.getHiringManagerProfile();
+    public ResponseEntity<ApiResponse<Map<String, Object>>> getHiringManagerProfile() {
+        if (!cacheService.isCacheReady()) {
+            return ResponseEntity.ok(ApiResponse.error("Cache is not ready yet, please try again later"));
+        }
+        Map<String, Object> profile = hiringService.getHiringManagerProfile();
+        return ResponseEntity.ok(ApiResponse.success("Hiring manager profile retrieved successfully", profile));
     }
 
     @GetMapping("/jobs")
-    public Map<String, Object> getJobOpenings() {
-        Map<String, Object> response = new HashMap<>();
+    public ResponseEntity<ApiResponse<List<JobOpening>>> getJobOpenings() {
+        if (!cacheService.isCacheReady()) {
+            return ResponseEntity.ok(ApiResponse.error("Cache is not ready yet, please try again later"));
+        }
         List<JobOpening> jobs = hiringService.getJobOpenings();
-        response.put("status", "success");
-        response.put("message", "Job openings retrieved successfully");
-        response.put("data", jobs);
-        return response;
+        return ResponseEntity.ok(ApiResponse.success("Job openings retrieved successfully", jobs));
     }
-} 
\ No newline at end of file
+}