Use OrderedDict for FIFO for LRU

Author: pydanny

fastcore/xtras.py

@@ -29,6 +29,8 @@
 from time import sleep,time,perf_counter
 from os.path import getmtime
 from dataclasses import dataclass, field, fields, is_dataclass, MISSING, make_dataclass
+import asyncio
+from collections import OrderedDict
 
 # %% ../nbs/03_xtras.ipynb
 def walk(
@@ -747,9 +749,8 @@ def is_namedtuple(cls):
 # %% ../nbs/03_xtras.ipynb
 def flexicache(*funcs, maxsize=128):
     "Like `lru_cache`, but customisable with policy `funcs`"
-    import asyncio
     def _f(func):
-        cache,states = {}, [None]*len(funcs)
+        cache,states = OrderedDict(), [None]*len(funcs)
         def _cache_logic(key, execute_func):
             if key in cache:
                 result,states = cache[key]
@@ -763,8 +764,7 @@ def _cache_logic(key, execute_func):
                 cache[key] = cache.pop(key)
                 return result
             cache[key] = (newres, [f(None) for f in funcs])
-            # remove the oldest item when cache overflows
-            if len(cache) > maxsize: del cache[next(iter(cache))]
+            if len(cache) > maxsize: cache.popitem(last=False)
             return newres
 
         @wraps(func)