diff --git a/view/frontend/templates/bfcache/handler.phtml b/view/frontend/templates/bfcache/handler.phtml
index c81186a..b48b663 100644
--- a/view/frontend/templates/bfcache/handler.phtml
+++ b/view/frontend/templates/bfcache/handler.phtml
@@ -18,31 +18,43 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 $script = <<<JS
     (() => {
         class BFCacheHandler {
-            /**
-             * Initialize BFCache handler with configuration options
-             */
             constructor() {
                 this.options = {
                     isCustomerLoggedIn: {$isCustomerLoggedIn},
                     enableUserInteractionRefreshMiniCart: {$enableUserInteractionRefresh},
                     autoCloseMenuMobile: {$autoCloseMenuMobile}
                 };
-
+    
                 this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
+                this._reloadTriggered = false;
+                this.dom = {};
+    
+                // Centralized selectors for reuse
+                this.selectors = {
+                    minicartCloseButton: '#btn-minicart-close',
+                    htmlElement: 'html'
+                };
             }
-
+    
             /**
-             * Initialize all BFCache functionalities
+             * Safe DOM getter with caching (re-queries only if element removed)
              */
+            getElement(key) {
+                const cached = this.dom[key];
+                if (cached && document.contains(cached)) return cached;
+                const el = document.querySelector(this.selectors[key]);
+                if (el) this.dom[key] = el;
+                return el;
+            }
+    
             init() {
                 this.refreshMiniCart();
                 this.reloadCustomerLoginPage();
                 this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
             }
-
+    
             /**
-             * Refresh minicart based on configuration
-             * Either immediately or on first user interaction
+             * Refresh minicart on user interaction or immediately
              */
             refreshMiniCart() {
                 if (this.options.enableUserInteractionRefreshMiniCart) {
@@ -51,56 +63,46 @@ $script = <<<JS
                     this.actionRefreshMiniCart();
                 }
             }
-
-            /**
-             * Refresh minicart on first user interaction
-             * Removes event listeners after first trigger to avoid multiple calls
-             */
+    
             refreshMiniCartOnUserInteraction() {
                 const refreshMiniCart = () => {
-                    this.userInteractionEvents.forEach(eventType => {
-                        window.removeEventListener(eventType, refreshMiniCart);
-                    });
+                    this.userInteractionEvents.forEach(eventType =>
+                        window.removeEventListener(eventType, refreshMiniCart)
+                    );
                     this.actionRefreshMiniCart();
                 };
-
-                this.userInteractionEvents.forEach(eventType => {
-                    window.addEventListener(eventType, refreshMiniCart, {
-                        once: true,
-                        passive: true
-                    });
-                });
+                const opts = { once: true, passive: true };
+                this.userInteractionEvents.forEach(eventType =>
+                    window.addEventListener(eventType, refreshMiniCart, opts)
+                );
             }
-
+    
             /**
-             * Check customer login state consistency and reload if needed
-             * Compares backend state with frontend localStorage state
+             * Compare frontend & backend login state and reload if mismatched
              */
             reloadCustomerLoginPage() {
                 const backendLoggedInState = this.options.isCustomerLoggedIn;
-
-                const getCustomerDataFromStorage = () => {
-                    try {
-                        const cacheStorage = localStorage.getItem('mage-cache-storage');
-                        const customerData = cacheStorage ? JSON.parse(cacheStorage).customer : null;
-                        return customerData;
-                    } catch (error) {
-                        console.warn('BFCache: Failed to parse customer data from localStorage', error);
-                        return null;
+    
+                let customerData = null;
+                try {
+                    const cacheStorage = localStorage.getItem('mage-cache-storage');
+                    if (cacheStorage) {
+                        customerData = JSON.parse(cacheStorage).customer || null;
                     }
-                };
-
-                const customerData = getCustomerDataFromStorage();
+                } catch {
+                    // Ignore parse errors silently
+                }
+    
                 const frontendLoggedInState = Boolean(customerData?.firstname);
-
-                if (frontendLoggedInState !== backendLoggedInState) {
+    
+                if (frontendLoggedInState !== backendLoggedInState && !this._reloadTriggered) {
+                    this._reloadTriggered = true;
                     window.location.reload();
                 }
             }
-
+    
             /**
-             * Update minicart data from customer data sections
-             * Reloads cart section to ensure accurate item count and totals
+             * Dispatch Magento event to refresh customer sections (minicart, etc.)
              */
             actionRefreshMiniCart() {
                 require([
@@ -109,51 +111,51 @@ $script = <<<JS
                     customerData.reload(['cart'], true);
                 });
             }
-
+    
             /**
-             * Handles cart drawer menu and mobile menu state management
-             *
-             * @param {boolean} autoCloseMenuMobile - Whether to auto-close mobile menu
+             * Close minicart & optionally close mobile menu
              */
             actionAutoCloseMenu(autoCloseMenuMobile) {
                 require([
-                    'jquery',
                     'Magento_Customer/js/customer-data'
-                ], function ($, customerData) {
+                ], ((customerData) => {
                     customerData.reload(['messages'], true);
-
-                    const minicartCloseButton = $('#btn-minicart-close');
-                    if (minicartCloseButton.length) {
-                        minicartCloseButton.trigger('click');
+    
+                    const minicartCloseButton = document.querySelector(this.selectors.minicartCloseButton);
+                    if (minicartCloseButton) {
+                        minicartCloseButton.click();
                     }
-
+    
                     if (autoCloseMenuMobile) {
-                        const htmlElement = $('html');
-
-                        const navigationClasses = ['nav-open', 'nav-before-open'];
-                        navigationClasses.forEach(function(className) {
-                            if (htmlElement.hasClass(className)) {
-                                htmlElement.removeClass(className);
-                            }
-                        });
+                        this.handleMenuClosure();
+                    }
+                }).bind(this));
+            }
+    
+            /**
+             * Handle closing of mobile menu
+             */
+            handleMenuClosure() {
+                const htmlElement = document.querySelector(this.selectors.htmlElement);
+    
+                const navigationClasses = ['nav-open', 'nav-before-open'];
+                navigationClasses.forEach(className => {
+                    if (htmlElement.classList.contains(className)) {
+                        htmlElement.classList.remove(className);
                     }
                 });
             }
-        };
-
+        }
+    
         /**
-         * Handle pageshow event for BFCache scenarios
-         * Detects back/forward navigation and page restoration from BFCache
+         * Page restoration handler — persistent global instance
          */
-        const handlePageShow = (event) => {
+        window.addEventListener('pageshow', (event) => {
             if (event.persisted) {
-                new BFCacheHandler().init();
+                (window._bfcacheHandler ??= new BFCacheHandler()).init();
             }
-        };
-
-        // Register event listener with proper cleanup capability
-        window.addEventListener('pageshow', handlePageShow, { passive: true });
+        }, { passive: true });
     })();
-JS;
+    JS;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false) ?>
diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index 53f7d6e..fc1c444 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -10,164 +10,169 @@ use MageOS\ThemeOptimization\ViewModel\BfCache;
 /** @var Escaper $escaper */
 /** @var ViewModelRegistry $viewModels */
 /** @var HyvaCsp $hyvaCsp */
-
 /** @var BfCache $bfcacheConfig */
 $bfcacheConfig = $viewModels->require(BfCache::class);
-
 $isCustomerLoggedIn = $bfcacheConfig->isCustomerLoggedIn() ? 'true' : 'false';
 $enableUserInteractionRefresh = $bfcacheConfig->isReloadMiniCartOnInteraction() ? 'true' : 'false';
 $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 ?>
 
 <script>
-    (() => {
-        class BFCacheHandler {
-            /**
-             * Initialize BFCache handler with configuration options
-             */
-            constructor() {
-                this.options = {
-                    isCustomerLoggedIn: {$isCustomerLoggedIn},
-                    enableUserInteractionRefreshMiniCart: {$enableUserInteractionRefresh},
-                    autoCloseMenuMobile: {$autoCloseMenuMobile}
-                };
-
-                this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
-            }
-
-            /**
-             * Initialize all BFCache functionalities
-             */
-            init() {
-                this.refreshMiniCart();
-                this.reloadCustomerLoginPage();
-                this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
+(() => {
+    class BFCacheHandler {
+        constructor() {
+            this.options = {
+                isCustomerLoggedIn: <?= $isCustomerLoggedIn ?>,
+                enableUserInteractionRefreshMiniCart: <?= $enableUserInteractionRefresh ?>,
+                autoCloseMenuMobile: <?= $autoCloseMenuMobile ?>
+            };
+
+            this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
+            this._reloadTriggered = false;
+            this.dom = {};
+
+            // Centralized selectors for reuse
+            this.selectors = {
+                cartDrawer: "[x-data^='initCartDrawer']",
+                mobileMenu: "[x-data^='initMenuMobile']",
+                desktopMenu: "[x-data^='initMenuDesktop']"
+            };
+        }
+
+        <?php
+        /**
+         * Safe DOM getter with caching (re-queries only if element removed)
+         */ ?>
+        getElement(key) {
+            const cached = this.dom[key];
+            if (cached && document.contains(cached)) return cached;
+            const el = document.querySelector(this.selectors[key]);
+            if (el) this.dom[key] = el;
+            return el;
+        }
+
+        init() {
+            this.refreshMiniCart();
+            this.reloadCustomerLoginPage();
+            this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
+        }
+
+        <?php
+        /**
+         * Refresh minicart on user interaction or immediately
+         */ ?>
+        refreshMiniCart() {
+            if (this.options.enableUserInteractionRefreshMiniCart) {
+                this.refreshMiniCartOnUserInteraction();
+            } else {
+                this.actionRefreshMiniCart();
             }
-
-            /**
-             * Refresh minicart based on configuration
-             * Either immediately or on first user interaction
-             */
-            refreshMiniCart() {
-                if (this.options.enableUserInteractionRefreshMiniCart) {
-                    this.refreshMiniCartOnUserInteraction();
-                } else {
-                    this.actionRefreshMiniCart();
+        }
+
+        refreshMiniCartOnUserInteraction() {
+            const refreshMiniCart = () => {
+                this.userInteractionEvents.forEach(eventType =>
+                    window.removeEventListener(eventType, refreshMiniCart)
+                );
+                this.actionRefreshMiniCart();
+            };
+            const opts = { once: true, passive: true };
+            this.userInteractionEvents.forEach(eventType =>
+                window.addEventListener(eventType, refreshMiniCart, opts)
+            );
+        }
+
+        <?php
+        /**
+         * Compare frontend & backend login state and reload if mismatched
+         */ ?>
+        reloadCustomerLoginPage() {
+            const backendLoggedInState = this.options.isCustomerLoggedIn;
+
+            let customerData = null;
+            try {
+                const cacheStorage = localStorage.getItem('mage-cache-storage');
+                if (cacheStorage) {
+                    customerData = JSON.parse(cacheStorage).customer || null;
                 }
+            } catch {
+                // Ignore parse errors silently
             }
 
-            /**
-             * Refresh minicart on first user interaction
-             * Removes event listeners after first trigger to avoid multiple calls
-             */
-            refreshMiniCartOnUserInteraction() {
-                const refreshMiniCart = () => {
-                    this.userInteractionEvents.forEach(eventType => {
-                        window.removeEventListener(eventType, refreshMiniCart);
-                    });
-                    this.actionRefreshMiniCart();
-                };
-
-                this.userInteractionEvents.forEach(eventType => {
-                    window.addEventListener(eventType, refreshMiniCart, {
-                        once: true,
-                        passive: true
-                    });
-                });
-            }
+            const frontendLoggedInState = Boolean(customerData?.firstname);
 
-            /**
-             * Check customer login state consistency and reload if needed
-             * Compares backend state with frontend localStorage state
-             */
-            reloadCustomerLoginPage() {
-                const backendLoggedInState = this.options.isCustomerLoggedIn;
-
-                const getCustomerDataFromStorage = () => {
-                    try {
-                        const cacheStorage = localStorage.getItem('mage-cache-storage');
-                        const customerData = cacheStorage ? JSON.parse(cacheStorage).customer : null;
-                        return customerData;
-                    } catch (error) {
-                        console.warn('BFCache: Failed to parse customer data from localStorage', error);
-                        return null;
-                    }
-                };
+            if (frontendLoggedInState !== backendLoggedInState && !this._reloadTriggered) {
+                this._reloadTriggered = true;
+                window.location.reload();
+            }
+        }
 
-                const customerData = getCustomerDataFromStorage();
-                const frontendLoggedInState = Boolean(customerData?.firstname);
+        <?php
+        /**
+         * Dispatch Magento event to refresh customer sections (minicart, etc.)
+         */ ?>
+        actionRefreshMiniCart() {
+            window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
+        }
 
-                if (frontendLoggedInState !== backendLoggedInState) {
-                    window.location.reload();
-                }
+        <?php
+        /**
+         * Close cart drawer & optionally close mobile/desktop menus
+         */ ?>
+        actionAutoCloseMenu(autoCloseMenuMobile) {
+            window.dispatchEvent(new Event('clear-messages'));
+
+            const cartDrawer = this.getElement('cartDrawer');
+            if (cartDrawer && typeof Alpine !== 'undefined') {
+                requestAnimationFrame(() => {
+                    const cartDrawerData = Alpine.$data(cartDrawer);
+                    if (cartDrawerData?.open !== undefined) {
+                        cartDrawerData.open = false;
+                        document.body.style.overflow = '';
+                    }
+                });
             }
 
-            /**
-             * Update minicart data from customer data sections
-             * Reloads cart section to ensure accurate item count and totals
-             */
-            actionRefreshMiniCart() {
-                window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
+            if (autoCloseMenuMobile) {
+                this.handleMenuClosure();
             }
+        }
 
-            /**
-             * Handles cart drawer menu and mobile menu state management
-             *
-             * @param {boolean} autoCloseMenuMobile - Whether to auto-close mobile menu
-             */
-            actionAutoCloseMenu(autoCloseMenuMobile) {
-                window.dispatchEvent(new Event('clear-messages'));
-
-                const cartDrawer = document.querySelector("[x-data^='initCartDrawer']");
-                if (!cartDrawer || typeof Alpine === 'undefined') {
-                    return;
-                }
-                const cartDrawerData = Alpine.\$data(cartDrawer);
-                if (cartDrawerData && typeof cartDrawerData.open !== 'undefined') {
-                    cartDrawerData.open = false;
-                    document.body.style.overflow = '';
-                }
-
-                if (autoCloseMenuMobile) {
-                    this.handleMenuClosure();
+        <?php
+        /**
+         * Handle closing of mobile & desktop menus via Alpine.js
+         */ ?>
+        handleMenuClosure() {
+            if (typeof Alpine === 'undefined' || !Alpine.$data) return;
+
+            const mobileMenu = this.getElement('mobileMenu');
+            if (mobileMenu) {
+                const mobileMenuData = Alpine.$data(mobileMenu);
+                if (mobileMenuData?.open !== undefined) {
+                    mobileMenuData.open = false;
                 }
             }
 
-            /**
-             * Close mobile and desktop menus
-             * Uses Alpine.js data binding to manage menu states
-             */
-            handleMenuClosure() {
-                const mobileMenu = document.querySelector("[x-data^='initMenuMobile']");
-                if (mobileMenu && typeof Alpine !== 'undefined') {
-                    const mobileMenuData = Alpine.\$data(mobileMenu);
-                    if (mobileMenuData && typeof mobileMenuData.open !== 'undefined') {
-                        mobileMenuData.open = false;
-                    }
-                }
-
-                const desktopMenu = document.querySelector("[x-data^='initMenuDesktop']");
-                if (desktopMenu && typeof Alpine !== 'undefined') {
-                    const desktopMenuData = Alpine.\$data(desktopMenu);
-                    if (desktopMenuData && typeof desktopMenuData.hoverPanelActiveId !== 'undefined') {
-                        desktopMenuData.hoverPanelActiveId = 0;
-                    }
+            const desktopMenu = this.getElement('desktopMenu');
+            if (desktopMenu) {
+                const desktopMenuData = Alpine.$data(desktopMenu);
+                if (desktopMenuData?.hoverPanelActiveId !== undefined) {
+                    desktopMenuData.hoverPanelActiveId = 0;
                 }
             }
-        };
-
-        /**
-         * Handle pageshow event for BFCache scenarios
-         * Detects back/forward navigation and page restoration from BFCache
-         */
-        const handlePageShow = (event) => {
-            if (event.persisted) {
-                new BFCacheHandler().init();
-            }
-        };
-
-        // Register event listener with proper cleanup capability
-        window.addEventListener('pageshow', handlePageShow, { passive: true });
-    })();
+        }
+    }
+
+    <?php
+    /**
+     * Page restoration handler — persistent global instance
+     */ ?>
+    window.addEventListener('pageshow', (event) => {
+        if (event.persisted) {
+            (window._bfcacheHandler ??= new BFCacheHandler()).init();
+        }
+    }, { passive: true });
+})();
 </script>
 <?php $hyvaCsp->registerInlineScript() ?>
+<?php /** The $hyvaCsp->registerInlineScript() has to be called directly after the closing script tag! There must be no other HTML in between. */ ?>