diff --git a/lisp/org-element.el b/lisp/org-element.el
index 643dc394b..276540293 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -5401,14 +5401,6 @@ When non-nil, it should be a vector representing POS arguments of
 `org-element--cache-find' called with non-nil, non-`both' SIDE argument.
 Also, see `org-element--cache-hash-size'.")
 
-(defvar org-element--cache-hash-statistics '(0 . 0)
-  "Cons cell storing how Org makes use of `org-element--cache-find' caching.
-The car is the number of successful uses and cdr is the total calls to
-`org-element--cache-find'.")
-(defvar org-element--cache-hash-nocache 0
-  "Number of calls to `org-element--cache-has' with `both' SIDE argument.
-These calls are not cached by hash.  See `org-element--cache-hash-size'.")
-
 (defvar-local org-element--cache-size 0
   "Size of the `org-element--cache'.
 
@@ -5742,25 +5734,6 @@ This function assumes `org-element--headline-cache' is a valid AVL tree."
                     (throw :inhibited nil)))
                 t))))))
 
-;; FIXME: Remove after we establish that hashing is effective.
-(defun org-element-cache-hash-show-statistics ()
-  "Display efficiency of O(1) query cache for `org-element--cache-find'.
-
-This extra caching is based on the following paper:
-Pugh [Information Processing Letters] (1990) Slow optimally balanced
- search strategies vs. cached fast uniformly balanced search
- strategies.  http://dx.doi.org/10.1016/0020-0190(90)90130-P
-
-Also, see `org-element--cache-size'."
-  (interactive)
-  (message "%.2f%% of cache searches hashed, %.2f%% non-hashable."
-	   (* 100
-	      (/ (float (car org-element--cache-hash-statistics))
-		 (cdr org-element--cache-hash-statistics)))
-	   (* 100
-	      (/ (float org-element--cache-hash-nocache)
-		 (cdr org-element--cache-hash-statistics)))))
-
 (defun org-element--cache-find (pos &optional side)
   "Find element in cache starting at POS or before.
 
@@ -5788,23 +5761,26 @@ the cache."
 	   lower upper)
       ;; `org-element--cache-key-less-p' does not accept markers.
       (when (markerp pos) (setq pos (marker-position pos)))
-      (cl-incf (cdr org-element--cache-hash-statistics))
-      (when (eq side 'both) (cl-incf org-element--cache-hash-nocache))
       (if (and hashed (not (eq side 'both))
+               ;; Ensure that HASHED is not within synchronized part
+               ;; of the cache.
+               (org-element-property :cached hashed)
                (or (not limit)
                    ;; Limit can be a list key.
                    (org-element--cache-key-less-p
                     (org-element--cache-key hashed)
                     limit))
+               ;; It is only safe to assume that element at POS is
+               ;; exact.  Extra elements starting before/after could
+               ;; have been added to cache and HASHED may no longer be
+               ;; valid.
                (= pos (org-element-property :begin hashed))
                ;; We cannot rely on element :begin for elements with
                ;; children starting at the same pos.
                (not (memq (org-element-type hashed)
-                        '(section org-data table)))
-               (org-element-property :cached hashed))
-          (progn
-            (cl-incf (car org-element--cache-hash-statistics))
-            hashed)
+                        '(section org-data table))))
+          hashed
+        ;; No appriate HASHED.  Search the cache.
         (while node
           (let* ((element (avl-tree--node-data node))
 	         (begin (org-element-property :begin element)))
@@ -5845,14 +5821,12 @@ the cache."
 	      (setq node nil
 		    lower element
 		    upper element)))))
-        (if (not side)
-            (aset org-element--cache-hash-left hash-pos lower)
-          (unless (eq side 'both)
-            (aset org-element--cache-hash-right hash-pos lower)))
         (pcase side
           (`both (cons lower upper))
-          (`nil lower)
-          (_ upper))))))
+          (`nil
+           (aset org-element--cache-hash-left hash-pos lower))
+          (_
+           (aset org-element--cache-hash-right hash-pos upper)))))))
 
 (defun org-element--cache-put (element)
   "Store ELEMENT in current buffer's cache, if allowed."