--- a/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
+++ b/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
@@ -45,23 +45,19 @@ add_task(async function test() {
 
   // Wait for the right frame visit to be registered.
   info("Waiting right frame visit");
   await deferredRightFrameVisit.promise;
 
   await BrowserTestUtils.removeTab(tab);
 });
 
-async function getTransitionForUrl(url) {
-  // Ensure all the transactions completed.
-  await PlacesTestUtils.promiseAsyncUpdates();
-  let db = await PlacesUtils.promiseDBConnection();
-  let rows = await db.execute(`
-    SELECT visit_type
-    FROM moz_historyvisits
-    JOIN moz_places h ON place_id = h.id
-    WHERE url_hash = hash(:url) AND url = :url`,
-    { url });
-  if (rows.length) {
-    return rows[0].getResultByName("visit_type");
-  }
-  return null;
+function getTransitionForUrl(url) {
+  return PlacesUtils.withConnectionWrapper("browser_markPageAsFollowedLink", async db => {
+    let rows = await db.execute(`
+      SELECT visit_type
+      FROM moz_historyvisits
+      JOIN moz_places h ON place_id = h.id
+      WHERE url_hash = hash(:url) AND url = :url
+      `, { url });
+    return rows.length ? rows[0].getResultByName("visit_type") : null;
+  });
 }

--- a/toolkit/components/places/History.jsm
+++ b/toolkit/components/places/History.jsm
@@ -541,20 +541,20 @@ this.History = Object.freeze({
     }
 
     guidOrURI = PlacesUtils.normalizeToURLOrGUID(guidOrURI);
     let isGuid = typeof guidOrURI == "string";
     let sqlFragment = isGuid ? "guid = :val"
                              : "url_hash = hash(:val) AND url = :val "
 
     return PlacesUtils.promiseDBConnection().then(async db => {
-      let rows = await db.execute(`SELECT 1 FROM moz_places
-                                    WHERE ${sqlFragment}
-                                      AND last_visit_date NOTNULL`,
-                                  { val: isGuid ? guidOrURI : guidOrURI.href });
+      let rows = await db.executeCached(`SELECT 1 FROM moz_places
+                                         WHERE ${sqlFragment}
+                                         AND last_visit_date NOTNULL`,
+                                        { val: isGuid ? guidOrURI : guidOrURI.href });
       return !!rows.length;
     });
   },
 
   /**
    * Clear all history.
    *
    * @return (Promise)