diff --git a/include/PSUEvent.hpp b/include/PSUEvent.hpp
index 93c06c1..2ee7a33 100644
--- a/include/PSUEvent.hpp
+++ b/include/PSUEvent.hpp
@@ -19,10 +19,11 @@
 #include <Utils.hpp>
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/asio/io_service.hpp>
-#include <boost/asio/streambuf.hpp>
+#include <boost/asio/random_access_file.hpp>
 #include <boost/container/flat_map.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
+#include <array>
 #include <memory>
 #include <set>
 #include <string>
@@ -57,11 +58,12 @@
 
     PowerState readState;
     boost::asio::deadline_timer waitTimer;
-    std::shared_ptr<boost::asio::streambuf> readBuf;
+    std::shared_ptr<std::array<char, 128>> buffer;
     void restartRead();
-    void handleResponse(const boost::system::error_code& err);
+    void handleResponse(const boost::system::error_code& err,
+                        size_t bytesTransferred);
     void updateValue(const int& newValue);
-    boost::asio::posix::stream_descriptor inputDev;
+    boost::asio::random_access_file inputDev;
     std::string psuName;
     std::string groupEventName;
     std::string fanName;
diff --git a/include/PSUSensor.hpp b/include/PSUSensor.hpp
index 9e32138..4d7aaba 100644
--- a/include/PSUSensor.hpp
+++ b/include/PSUSensor.hpp
@@ -2,10 +2,11 @@
 
 #include <PwmSensor.hpp>
 #include <Thresholds.hpp>
-#include <boost/asio/streambuf.hpp>
+#include <boost/asio/random_access_file.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sensor.hpp>
 
+#include <array>
 #include <memory>
 #include <string>
 #include <utility>
@@ -26,15 +27,19 @@
     void setupRead(void);
 
   private:
+    // Note, this buffer is a shared_ptr because during a read, its lifetime
+    // might have to outlive the PSUSensor class if the object gets destroyed
+    // while in the middle of a read operation
+    std::shared_ptr<std::array<char, 128>> buffer;
     sdbusplus::asio::object_server& objServer;
-    boost::asio::posix::stream_descriptor inputDev;
+    boost::asio::random_access_file inputDev;
     boost::asio::deadline_timer waitTimer;
     std::string path;
     unsigned int sensorFactor;
     double sensorOffset;
     thresholds::ThresholdTimer thresholdTimer;
     void restartRead();
-    void handleResponse(const boost::system::error_code& err);
+    void handleResponse(const boost::system::error_code& err, size_t bytesRead);
     void checkThresholds(void) override;
     unsigned int sensorPollMs = defaultSensorPollMs;