diff --git a/src/blackmisc/slot.h b/src/blackmisc/slot.h
index 6fd29159f..b7aa0967d 100644
--- a/src/blackmisc/slot.h
+++ b/src/blackmisc/slot.h
@@ -15,10 +15,45 @@
 #include <QPointer>
 #include <QObject>
 #include <QtGlobal>
+#include <atomic>
 #include <functional>
+#include <future>
+#include <memory>
+#include "blackmisc/invoke.h"
 
 namespace BlackMisc
 {
+    /*!
+     * Wrapper around QObject::connect which disconnects after the signal has been emitted once.
+     */
+    template <typename T, typename U, typename F, typename G>
+    QMetaObject::Connection connectOnce(T *sender, F signal, U *receiver, G &&slot, Qt::ConnectionType type = Qt::AutoConnection)
+    {
+        std::promise<QMetaObject::Connection> promise;
+        auto called = std::make_shared<std::atomic_flag>();
+        called->clear();
+        auto wrapper = [receiver, called, connection = promise.get_future().share(), slot = std::forward<G>(slot)](auto &&... args)
+        {
+            if (called->test_and_set()) { return; }
+            QObject::disconnect(connection.get());
+            Private::invokeSlot(slot, receiver, std::forward<decltype(args)>(args)...);
+        };
+        auto connection = QObject::connect(sender, signal, receiver, std::move(wrapper), type);
+        promise.set_value(connection);
+        return connection;
+    }
+
+    /*!
+     * Wrapper around QObject::connect which disconnects after the signal has been emitted once.
+     * \note Slot has no context, so will always be a direct connection, slot will be called in sender's thread.
+     */
+    template <typename T, typename F, typename G>
+    QMetaObject::Connection connectOnce(T *sender, F signal, G &&slot)
+    {
+        static_assert(! std::is_member_pointer<std::decay_t<G>>::value, "If slot is a pointer to member, a receiver must be supplied");
+        return connectOnce(sender, signal, sender, std::forward<G>(slot));
+    }
+
     /*!
      * Callable wrapper for a member function with function signature F. General template, not
      * implemented; the partial specialization for function signatures is what does the actual work
diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h
index 032e5eb82..de4eb3feb 100644
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -20,6 +20,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/range.h"
+#include "blackmisc/slot.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/valuecacheprivate.h"
 #include "blackmisc/variant.h"
@@ -441,12 +442,7 @@ namespace BlackMisc
         //! \private Connect a function to be called (only once) when the owner's objectName changes.
         void onOwnerNameChanged(std::function<void()> function)
         {
-            auto connection = std::make_shared<QMetaObject::Connection>();
-            *connection = QObject::connect(m_page->parent(), &QObject::objectNameChanged, [connection, function](const QString &)
-            {
-                QObject::disconnect(*connection);
-                function();
-            });
+            connectOnce(m_page->parent(), &QObject::objectNameChanged, [function](const QString &) { function(); });
         }
 
         Private::CValuePage *m_page = (qFatal("Must be initialized"), nullptr); //!< \private