diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/RouterContext.cpp /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/RouterContext.cpp
--- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/RouterContext.cpp	2025-01-29 02:45:26.000000000 +0000
+++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/RouterContext.cpp	2025-01-29 02:30:48.000000000 +0000
@@ -79,4 +79,6 @@
 			CleanUp (); // GarlicDestination
 		}
+		if (m_SavingRouterInfo.valid ())
+			m_SavingRouterInfo.get ();
 	}	
 
@@ -255,10 +257,19 @@
 	void RouterContext::UpdateRouterInfo ()
 	{
+		std::shared_ptr<i2p::data::RouterInfo::Buffer> buffer;
 		{
 			std::lock_guard<std::mutex> l(m_RouterInfoMutex);
 			m_RouterInfo.CreateBuffer (m_Keys);
+			buffer = m_RouterInfo.CopyBuffer ();
 		}
-		m_RouterInfo.SaveToFile (i2p::fs::DataDirPath (ROUTER_INFO));
 		m_LastUpdateTime = i2p::util::GetSecondsSinceEpoch ();
+		// defer saving buffer to disk
+		if (m_SavingRouterInfo.valid ())
+			m_SavingRouterInfo.get ();
+		m_SavingRouterInfo = std::async (std::launch::async, 
+			[buffer = std::move(buffer)]() 
+		    {
+				i2p::data::RouterInfo::SaveToFile (i2p::fs::DataDirPath (ROUTER_INFO), buffer);
+			});
 	}
 
diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/RouterContext.h /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/RouterContext.h
--- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/RouterContext.h	2025-01-29 02:45:26.000000000 +0000
+++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/RouterContext.h	2025-01-29 02:30:48.000000000 +0000
@@ -14,4 +14,5 @@
 #include <memory>
 #include <random>
+#include <future>
 #include <unordered_set>
 #include <boost/asio.hpp>
@@ -267,4 +268,5 @@
 			mutable std::mutex m_RouterInfoMutex;
 			std::mt19937 m_Rng;
+			std::future<void> m_SavingRouterInfo;
 	};