diff --git a/tests/test_market_intervals_tlv.py b/tests/test_market_intervals_tlv.py
index f00df2a..4789d58 100644
--- a/tests/test_market_intervals_tlv.py
+++ b/tests/test_market_intervals_tlv.py
@@ -1,7 +1,5 @@
 import unittest
 
-# import sys ; sys.path.insert(0, "/home/gonzo/ReposForks/exchange_calendars.dev")
-
 from .context import yfc_dat as yfcd
 from .context import yfc_time as yfct
 
diff --git a/tests/test_market_schedules_tlv.py b/tests/test_market_schedules_tlv.py
index a542cfe..8d98ca1 100644
--- a/tests/test_market_schedules_tlv.py
+++ b/tests/test_market_schedules_tlv.py
@@ -1,8 +1,6 @@
 import unittest
 from pprint import pprint
 
-# import sys ; sys.path.insert(0, "/home/gonzo/ReposForks/exchange_calendars.dev")
-
 from .context import yfc_time as yfct
 from .context import yfc_dat as yfcd
 
diff --git a/yfinance_cache/yfc_ticker.py b/yfinance_cache/yfc_ticker.py
index 7f30302..6a2afd4 100644
--- a/yfinance_cache/yfc_ticker.py
+++ b/yfinance_cache/yfc_ticker.py
@@ -1365,6 +1365,7 @@ def _fetchAndAddRanges_sparse(self, h, pstr, interval, ranges_to_fetch, prepost,
             except yfcd.NoPriceDataInRangeException:
                 # If only trying to fetch 1 day of 1d data, then print warning instead of exception.
                 # Could add additional condition of dividend previous day (seems to mess up table).
+                ignore = False
                 if interval == yfcd.Interval.Days1 and rend - rstart == td_1d:
                     ignore = True
                 elif interval == yfcd.Interval.Mins1 and rend - rstart <= datetime.timedelta(minutes=10):
diff --git a/yfinance_cache/yfc_time.py b/yfinance_cache/yfc_time.py
index 73c0a5e..dab7761 100644
--- a/yfinance_cache/yfc_time.py
+++ b/yfinance_cache/yfc_time.py
@@ -4,7 +4,6 @@
 from dateutil.relativedelta import relativedelta
 from zoneinfo import ZoneInfo
 
-import sys ; sys.path.insert(0, "/home/gonzo/ReposForks/exchange_calendars.dev")
 import exchange_calendars as xcal
 
 import pandas as pd
@@ -99,6 +98,7 @@ def SetExchangeTzName(exchange, tz):
 schedDbMetadata = {}
 db_mem = sql.connect(":memory:")
 schedIntervalsCache = {}
+xcal_accept_cache_arg = None
 
 
 def GetExchangeDataDelay(exchange):
@@ -112,6 +112,7 @@ def GetExchangeDataDelay(exchange):
 
 def GetCalendar(exchange):
     global calCache
+    global xcal_accept_cache_arg
 
     cal_name = yfcd.exchangeToXcalExchange[exchange]
 
@@ -123,7 +124,17 @@ def GetCalendar(exchange):
         start = "1997"
     else:
         start = str(yfcd.yf_min_year)
-    cal = xcal.get_calendar(cal_name, start=start, cache=True)
+    if xcal_accept_cache_arg is None:
+        try:
+            xcal_accept_cache_arg = True
+            cal = xcal.get_calendar(cal_name, start=start, cache=True)
+        except TypeError:
+            xcal_accept_cache_arg = False
+            cal = xcal.get_calendar(cal_name, start=start)
+    elif xcal_accept_cache_arg:
+        cal = xcal.get_calendar(cal_name, start=start, cache=True)
+    else:
+        cal = xcal.get_calendar(cal_name, start=start)
 
     df = cal.schedule
     tz = ZoneInfo(GetExchangeTzName(exchange))
diff --git a/yfinance_cache/yfc_upgrade.py b/yfinance_cache/yfc_upgrade.py
index a10fb8a..7bc2ed9 100644
--- a/yfinance_cache/yfc_upgrade.py
+++ b/yfinance_cache/yfc_upgrade.py
@@ -437,9 +437,6 @@ def price_history_cleanup_tz_mess():
 			f_pieces = f.split('.')
 			ext = f_pieces[-1]
 
-			# if fp != "/home/gonzo/.cache/yfinance-cache/MEL.NZ/history-1d.pkl":
-			# 	continue
-
 			f_base = '.'.join(f_pieces[:-1])
 
 			if ("history" in f_base) and (ext == "pkl"):