diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
index f11c4bf..d3fa3ad 100644
--- a/app/watchdog_service.cpp
+++ b/app/watchdog_service.cpp
@@ -6,7 +6,6 @@
 #include <xyz/openbmc_project/State/Watchdog/server.hpp>
 
 #include "host-ipmid/ipmid-api.h"
-#include "utils.hpp"
 
 using sdbusplus::message::variant_ns::get;
 using sdbusplus::message::variant_ns::variant;
@@ -17,20 +16,21 @@
 static constexpr char wd_intf[] = "xyz.openbmc_project.State.Watchdog";
 static constexpr char prop_intf[] = "org.freedesktop.DBus.Properties";
 
+ipmi::ServiceCache WatchdogService::wd_service(wd_intf, wd_path);
+
 WatchdogService::WatchdogService()
-    : bus(ipmid_get_sd_bus_connection()),
-    wd_service(ipmi::getService(bus, wd_intf, wd_path))
+    : bus(ipmid_get_sd_bus_connection())
 {
 }
 
 WatchdogService::Properties WatchdogService::getProperties()
 {
-    auto request = bus.new_method_call(wd_service.c_str(), wd_path,
-            prop_intf, "GetAll");
+    auto request = wd_service.newMethodCall(bus, prop_intf, "GetAll");
     request.append(wd_intf);
     auto response = bus.call(request);
     if (response.is_method_error())
     {
+        wd_service.invalidate();
         throw std::runtime_error("Failed to get watchdog properties");
     }
 
@@ -49,12 +49,12 @@
 template <typename T>
 void WatchdogService::setProperty(const std::string& key, const T& val)
 {
-    auto request = bus.new_method_call(wd_service.c_str(), wd_path,
-            prop_intf, "Set");
+    auto request = wd_service.newMethodCall(bus, prop_intf, "Set");
     request.append(wd_intf, key, variant<T>(val));
     auto response = bus.call(request);
     if (response.is_method_error())
     {
+        wd_service.invalidate();
         throw std::runtime_error(std::string("Failed to set property: ") + key);
     }
 }
diff --git a/app/watchdog_service.hpp b/app/watchdog_service.hpp
index 432c7ce..e93b7f3 100644
--- a/app/watchdog_service.hpp
+++ b/app/watchdog_service.hpp
@@ -2,6 +2,8 @@
 #include <sdbusplus/bus.hpp>
 #include <xyz/openbmc_project/State/Watchdog/server.hpp>
 
+#include "utils.hpp"
+
 /** @class WatchdogService
  *  @brief Access to the running OpenBMC watchdog implementation.
  *  @details Easy accessor for servers that implement the
@@ -67,7 +69,7 @@
         /** @brief sdbusplus handle */
         sdbusplus::bus::bus bus;
         /** @brief The name of the mapped host watchdog service */
-        const std::string wd_service;
+        static ipmi::ServiceCache wd_service;
 
         /** @brief Sets the value of the property on the host watchdog
          *