@expo/entity-cache-adapter-local-memory 0.51.0 → 0.54.0

package/build/src/GenericLocalMemoryCacher.d.ts

@@ -1,17 +1,38 @@
 import { CacheLoadResult, EntityConfiguration, IEntityGenericCacher, IEntityLoadKey, IEntityLoadValue } from '@expo/entity';
-import LRUCache from 'lru-cache';
 export declare const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE: unique symbol;
+/**
+ * Type of value stored in the local memory cache. This is either the cached fields, or the
+ * DOES_NOT_EXIST_LOCAL_MEMORY_CACHE sentinel value.
+ */
 export type LocalMemoryCacheValue<TFields extends Record<string, any>> = Readonly<TFields> | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
-export type LocalMemoryCache<TFields extends Record<string, any>> = LRUCache<string, LocalMemoryCacheValue<TFields>>;
+/**
+ * Interface for a local memory cache used by GenericLocalMemoryCacher. Most often, this is something like
+ * a TTLCache from the `@isaacs/ttlcache` package or an lru-cache.
+ */
+export interface ILocalMemoryCache<TFields extends Record<string, any>> {
+    /**
+     * Gets a value from the cache for specified key.
+     * @param key - key to get
+     * @returns the cached value, or undefined if not present
+     */
+    get(key: string): LocalMemoryCacheValue<TFields> | undefined;
+    /**
+     * Sets a value in the cache for specified key.
+     * @param key - key to set
+     * @param value - value to set
+     */
+    set(key: string, value: LocalMemoryCacheValue<TFields>): void;
+    /**
+     * Deletes a value from the cache for specified key.
+     * @param key - key to delete
+     */
+    delete(key: string): void;
+}
 export declare class GenericLocalMemoryCacher<TFields extends Record<string, any>, TIDField extends keyof TFields> implements IEntityGenericCacher<TFields, TIDField> {
     private readonly entityConfiguration;
     private readonly localMemoryCache;
-    constructor(entityConfiguration: EntityConfiguration<TFields, TIDField>, localMemoryCache: LocalMemoryCache<TFields>);
-    static createLRUCache<TFields extends Record<string, any>>(options?: {
-        maxSize?: number;
-        ttlSeconds?: number;
-    }): LocalMemoryCache<TFields>;
-    static createNoOpCache<TFields extends Record<string, any>>(): LocalMemoryCache<TFields>;
+    constructor(entityConfiguration: EntityConfiguration<TFields, TIDField>, localMemoryCache: ILocalMemoryCache<TFields>);
+    static createNoOpCache<TFields extends Record<string, any>>(): ILocalMemoryCache<TFields>;
     loadManyAsync(keys: readonly string[]): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>>;
     cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void>;
     cacheDBMissesAsync(keys: readonly string[]): Promise<void>;

package/build/src/GenericLocalMemoryCacher.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericLocalMemoryCacher = exports.DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = void 0;
 const entity_1 = require("@expo/entity");
-const lru_cache_1 = __importDefault(require("lru-cache"));
 // Sentinel value we store in local memory to negatively cache a database miss.
 // The sentinel value is distinct from any (positively) cached value.
 exports.DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
@@ -16,21 +12,14 @@ class GenericLocalMemoryCacher {
         this.entityConfiguration = entityConfiguration;
         this.localMemoryCache = localMemoryCache;
     }
-    static createLRUCache(options = {}) {
-        const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
-        const DEFAULT_LRU_CACHE_SIZE = 10000;
-        const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-        return new lru_cache_1.default({
-            max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-            length: (value) => (value === exports.DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1),
-            maxAge: maxAgeSeconds * 1000, // convert to ms
-        });
-    }
     static createNoOpCache() {
-        return new lru_cache_1.default({
-            max: 0,
-            maxAge: -1,
-        });
+        return {
+            get(_key) {
+                return undefined;
+            },
+            set(_key, _value) { },
+            delete(_key) { },
+        };
     }
     async loadManyAsync(keys) {
         const cacheResults = new Map();
@@ -67,7 +56,7 @@ class GenericLocalMemoryCacher {
     }
     async invalidateManyAsync(keys) {
         for (const key of keys) {
-            this.localMemoryCache.del(key);
+            this.localMemoryCache.delete(key);
         }
     }
     makeCacheKeyForStorage(key, value) {

package/build/src/GenericLocalMemoryCacher.js.map

@@ -1 +1 @@
-{"version":3,"file":"GenericLocalMemoryCacher.js","sourceRoot":"","sources":["../../src/GenericLocalMemoryCacher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GenericLocalMemoryCacher.js","sourceRoot":"","sources":["../../src/GenericLocalMemoryCacher.ts"],"names":[],"mappings":"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"}

package/build/src/LocalMemoryCacheAdapterProvider.d.ts

@@ -1,4 +1,6 @@
 import { EntityConfiguration, IEntityCacheAdapter, IEntityCacheAdapterProvider } from '@expo/entity';
+import { ILocalMemoryCache } from './GenericLocalMemoryCacher';
+export type LocalMemoryCacheCreator = <TFields extends Record<string, any>>() => ILocalMemoryCache<TFields>;
 /**
  * Vends local memory cache adapters. An instance of this class may be shared across requests to
  * share the local memory cache.
@@ -6,16 +8,13 @@ import { EntityConfiguration, IEntityCacheAdapter, IEntityCacheAdapterProvider }
 export declare class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvider {
     private readonly localMemoryCacheCreator;
     /**
-     * @returns a no-op local memory cache adapter provider, or one that doesn't cache locally.
+     * @returns a no-op local memory cache adapter provider, or one that doesn't cache at all.
      */
     static createNoOpProvider(): IEntityCacheAdapterProvider;
     /**
-     * @returns a local memory cache adapter provider configured with the supplied options.
+     * @returns a local memory cache adapter provider configured with the supplied local memory cache creator function.
      */
-    static createProviderWithOptions(options?: {
-        maxSize?: number;
-        ttlSeconds?: number;
-    }): IEntityCacheAdapterProvider;
+    static createProviderWithCacheCreator(cacheCreator: LocalMemoryCacheCreator): IEntityCacheAdapterProvider;
     private readonly localMemoryCacheAdapterMap;
     private constructor();
     getCacheAdapter<TFields extends Record<string, any>, TIDField extends keyof TFields>(entityConfiguration: EntityConfiguration<TFields, TIDField>): IEntityCacheAdapter<TFields, TIDField>;

package/build/src/LocalMemoryCacheAdapterProvider.js

@@ -10,16 +10,16 @@ const GenericLocalMemoryCacher_1 = require("./GenericLocalMemoryCacher");
 class LocalMemoryCacheAdapterProvider {
     localMemoryCacheCreator;
     /**
-     * @returns a no-op local memory cache adapter provider, or one that doesn't cache locally.
+     * @returns a no-op local memory cache adapter provider, or one that doesn't cache at all.
      */
     static createNoOpProvider() {
         return new LocalMemoryCacheAdapterProvider(() => GenericLocalMemoryCacher_1.GenericLocalMemoryCacher.createNoOpCache());
     }
     /**
-     * @returns a local memory cache adapter provider configured with the supplied options.
+     * @returns a local memory cache adapter provider configured with the supplied local memory cache creator function.
      */
-    static createProviderWithOptions(options = {}) {
-        return new LocalMemoryCacheAdapterProvider(() => GenericLocalMemoryCacher_1.GenericLocalMemoryCacher.createLRUCache(options));
+    static createProviderWithCacheCreator(cacheCreator) {
+        return new LocalMemoryCacheAdapterProvider(cacheCreator);
     }
     localMemoryCacheAdapterMap = new Map();
     constructor(localMemoryCacheCreator) {

package/build/src/LocalMemoryCacheAdapterProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalMemoryCacheAdapterProvider.js","sourceRoot":"","sources":["../../src/LocalMemoryCacheAdapterProvider.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,yEAAwF;AAExF;;;GAGG;AACH,MAAa,+BAA+B;IA2BvB;IA1BnB;;OAEG;IACH,MAAM,CAAC,kBAAkB;QACvB,OAAO,IAAI,+BAA+B,CAAC,GAAwC,EAAE,CACnF,mDAAwB,CAAC,eAAe,EAAW,CACpD,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,yBAAyB,CAC9B,UAAqD,EAAE;QAEvD,OAAO,IAAI,+BAA+B,CAAC,GAAwC,EAAE,CACnF,mDAAwB,CAAC,cAAc,CAAU,OAAO,CAAC,CAC1D,CAAC;IACJ,CAAC;IAEgB,0BAA0B,GAAG,IAAI,GAAG,EAGlD,CAAC;IAEJ,YACmB,uBAEe;QAFf,4BAAuB,GAAvB,uBAAuB,CAER;IAC/B,CAAC;IAEG,eAAe,CACpB,mBAA2D;QAE3D,OAAO,IAAA,wBAAe,EAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,SAAS,EAAE,GAAG,EAAE;YAC1F,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,EAAW,CAAC;YACjE,OAAO,IAAI,kCAAyB,CAClC,IAAI,mDAAwB,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CACpE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1CD,0EA0CC"}
+{"version":3,"file":"LocalMemoryCacheAdapterProvider.js","sourceRoot":"","sources":["../../src/LocalMemoryCacheAdapterProvider.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,yEAAyF;AAKzF;;;GAGG;AACH,MAAa,+BAA+B;IAwBL;IAvBrC;;OAEG;IACH,MAAM,CAAC,kBAAkB;QACvB,OAAO,IAAI,+BAA+B,CAAC,GAAwC,EAAE,CACnF,mDAAwB,CAAC,eAAe,EAAW,CACpD,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,8BAA8B,CACnC,YAAqC;QAErC,OAAO,IAAI,+BAA+B,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAEgB,0BAA0B,GAAG,IAAI,GAAG,EAGlD,CAAC;IAEJ,YAAqC,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;IAAG,CAAC;IAElF,eAAe,CACpB,mBAA2D;QAE3D,OAAO,IAAA,wBAAe,EAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,SAAS,EAAE,GAAG,EAAE;YAC1F,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,EAAW,CAAC;YACjE,OAAO,IAAI,kCAAyB,CAClC,IAAI,mDAAwB,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CACpE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AApCD,0EAoCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-cache-adapter-local-memory",
-  "version": "0.51.0",
+  "version": "0.54.0",
   "description": "Cross-request local memory cache adapter for @expo/entity",
   "files": [
     "build",
@@ -28,14 +28,13 @@
   "author": "Expo",
   "license": "MIT",
   "dependencies": {
-    "@expo/entity": "^0.51.0",
-    "lru-cache": "^6.0.0"
+    "@expo/entity": "^0.54.0"
   },
   "devDependencies": {
-    "@expo/entity-testing-utils": "^0.51.0",
-    "@jest/globals": "^30.2.0",
-    "@types/lru-cache": "^5.1.1",
-    "typescript": "^5.9.3"
+    "@expo/entity-testing-utils": "^0.54.0",
+    "@isaacs/ttlcache": "2.1.4",
+    "@jest/globals": "30.2.0",
+    "typescript": "5.9.3"
   },
-  "gitHead": "9140938e1cd20bab7e89224b9e5670e963d735d9"
+  "gitHead": "283c02eedbd4f5721afad96f31ada85bf92afb41"
 }

package/src/GenericLocalMemoryCacher.ts

@@ -6,47 +6,62 @@ import {
   IEntityLoadKey,
   IEntityLoadValue,
 } from '@expo/entity';
-import LRUCache from 'lru-cache';
 
 // Sentinel value we store in local memory to negatively cache a database miss.
 // The sentinel value is distinct from any (positively) cached value.
 export const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
+
+/**
+ * Type of value stored in the local memory cache. This is either the cached fields, or the
+ * DOES_NOT_EXIST_LOCAL_MEMORY_CACHE sentinel value.
+ */
 export type LocalMemoryCacheValue<TFields extends Record<string, any>> =
   | Readonly<TFields>
   | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
-export type LocalMemoryCache<TFields extends Record<string, any>> = LRUCache<
-  string,
-  LocalMemoryCacheValue<TFields>
->;
+
+/**
+ * Interface for a local memory cache used by GenericLocalMemoryCacher. Most often, this is something like
+ * a TTLCache from the `@isaacs/ttlcache` package or an lru-cache.
+ */
+export interface ILocalMemoryCache<TFields extends Record<string, any>> {
+  /**
+   * Gets a value from the cache for specified key.
+   * @param key - key to get
+   * @returns the cached value, or undefined if not present
+   */
+  get(key: string): LocalMemoryCacheValue<TFields> | undefined;
+
+  /**
+   * Sets a value in the cache for specified key.
+   * @param key - key to set
+   * @param value - value to set
+   */
+  set(key: string, value: LocalMemoryCacheValue<TFields>): void;
+
+  /**
+   * Deletes a value from the cache for specified key.
+   * @param key - key to delete
+   */
+  delete(key: string): void;
+}
 
 export class GenericLocalMemoryCacher<
   TFields extends Record<string, any>,
   TIDField extends keyof TFields,
-> implements IEntityGenericCacher<TFields, TIDField>
-{
+> implements IEntityGenericCacher<TFields, TIDField> {
   constructor(
     private readonly entityConfiguration: EntityConfiguration<TFields, TIDField>,
-    private readonly localMemoryCache: LocalMemoryCache<TFields>,
+    private readonly localMemoryCache: ILocalMemoryCache<TFields>,
   ) {}
 
-  static createLRUCache<TFields extends Record<string, any>>(
-    options: { maxSize?: number; ttlSeconds?: number } = {},
-  ): LocalMemoryCache<TFields> {
-    const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
-    const DEFAULT_LRU_CACHE_SIZE = 10000;
-    const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-      length: (value) => (value === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1),
-      maxAge: maxAgeSeconds * 1000, // convert to ms
-    });
-  }
-
-  static createNoOpCache<TFields extends Record<string, any>>(): LocalMemoryCache<TFields> {
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: 0,
-      maxAge: -1,
-    });
+  static createNoOpCache<TFields extends Record<string, any>>(): ILocalMemoryCache<TFields> {
+    return {
+      get(_key: string): LocalMemoryCacheValue<TFields> | undefined {
+        return undefined;
+      },
+      set(_key: string, _value: LocalMemoryCacheValue<TFields>): void {},
+      delete(_key: string): void {},
+    };
   }
 
   public async loadManyAsync(
@@ -87,7 +102,7 @@ export class GenericLocalMemoryCacher<
 
   public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
     for (const key of keys) {
-      this.localMemoryCache.del(key);
+      this.localMemoryCache.delete(key);
     }
   }
 

package/src/LocalMemoryCacheAdapterProvider.ts

@@ -6,15 +6,18 @@ import {
   IEntityCacheAdapterProvider,
 } from '@expo/entity';
 
-import { GenericLocalMemoryCacher, LocalMemoryCache } from './GenericLocalMemoryCacher';
+import { GenericLocalMemoryCacher, ILocalMemoryCache } from './GenericLocalMemoryCacher';
 
+export type LocalMemoryCacheCreator = <
+  TFields extends Record<string, any>,
+>() => ILocalMemoryCache<TFields>;
 /**
  * Vends local memory cache adapters. An instance of this class may be shared across requests to
  * share the local memory cache.
  */
 export class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvider {
   /**
-   * @returns a no-op local memory cache adapter provider, or one that doesn't cache locally.
+   * @returns a no-op local memory cache adapter provider, or one that doesn't cache at all.
    */
   static createNoOpProvider(): IEntityCacheAdapterProvider {
     return new LocalMemoryCacheAdapterProvider(<TFields extends Record<string, any>>() =>
@@ -23,14 +26,12 @@ export class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvi
   }
 
   /**
-   * @returns a local memory cache adapter provider configured with the supplied options.
+   * @returns a local memory cache adapter provider configured with the supplied local memory cache creator function.
    */
-  static createProviderWithOptions(
-    options: { maxSize?: number; ttlSeconds?: number } = {},
+  static createProviderWithCacheCreator(
+    cacheCreator: LocalMemoryCacheCreator,
   ): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields extends Record<string, any>>() =>
-      GenericLocalMemoryCacher.createLRUCache<TFields>(options),
-    );
+    return new LocalMemoryCacheAdapterProvider(cacheCreator);
   }
 
   private readonly localMemoryCacheAdapterMap = new Map<
@@ -38,11 +39,7 @@ export class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvi
     GenericEntityCacheAdapter<any, any>
   >();
 
-  private constructor(
-    private readonly localMemoryCacheCreator: <
-      TFields extends Record<string, any>,
-    >() => LocalMemoryCache<TFields>,
-  ) {}
+  private constructor(private readonly localMemoryCacheCreator: LocalMemoryCacheCreator) {}
 
   public getCacheAdapter<TFields extends Record<string, any>, TIDField extends keyof TFields>(
     entityConfiguration: EntityConfiguration<TFields, TIDField>,

package/src/__testfixtures__/createLocalMemoryTestEntityCompanionProvider.ts

@@ -4,11 +4,26 @@ import {
   NoOpEntityMetricsAdapter,
 } from '@expo/entity';
 import { StubDatabaseAdapterProvider, StubQueryContextProvider } from '@expo/entity-testing-utils';
+import { TTLCache } from '@isaacs/ttlcache';
 
+import { ILocalMemoryCache, LocalMemoryCacheValue } from '../GenericLocalMemoryCacher';
 import { LocalMemoryCacheAdapterProvider } from '../LocalMemoryCacheAdapterProvider';
 
 const queryContextProvider = new StubQueryContextProvider();
 
+function createTTLCache<TFields extends Record<string, any>>(
+  options: { maxSize?: number; ttlSeconds?: number } = {},
+): ILocalMemoryCache<TFields> {
+  const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
+  const DEFAULT_LRU_CACHE_SIZE = 10000;
+  const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
+  return new TTLCache<string, LocalMemoryCacheValue<TFields>>({
+    max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
+    ttl: maxAgeSeconds * 1000, // convert to ms
+    updateAgeOnGet: true,
+  });
+}
+
 export const createLocalMemoryTestEntityCompanionProvider = (
   localMemoryOptions: { maxSize?: number; ttlSeconds?: number } = {},
   metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
@@ -16,7 +31,9 @@ export const createLocalMemoryTestEntityCompanionProvider = (
   const localMemoryCacheAdapterProvider =
     localMemoryOptions.maxSize === 0 && localMemoryOptions.ttlSeconds === 0
       ? LocalMemoryCacheAdapterProvider.createNoOpProvider()
-      : LocalMemoryCacheAdapterProvider.createProviderWithOptions(localMemoryOptions);
+      : LocalMemoryCacheAdapterProvider.createProviderWithCacheCreator(() =>
+          createTTLCache(localMemoryOptions),
+        );
   return new EntityCompanionProvider(
     metricsAdapter,
     new Map([

package/src/__tests__/GenericLocalMemoryCacher-test.ts

@@ -7,11 +7,14 @@ import {
   SingleFieldValueHolderMap,
   UUIDField,
 } from '@expo/entity';
+import { TTLCache } from '@isaacs/ttlcache';
 import { describe, expect, it } from '@jest/globals';
 
 import {
   DOES_NOT_EXIST_LOCAL_MEMORY_CACHE,
   GenericLocalMemoryCacher,
+  ILocalMemoryCache,
+  LocalMemoryCacheValue,
 } from '../GenericLocalMemoryCacher';
 
 type BlahFields = {
@@ -28,41 +31,19 @@ const entityConfiguration = new EntityConfiguration<BlahFields, 'id'>({
   cacheAdapterFlavor: 'local-memory',
 });
 
-describe(GenericLocalMemoryCacher, () => {
-  describe(GenericLocalMemoryCacher.createLRUCache, () => {
-    it('creates a cache with default options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache();
-      expect(cache.max).toBe(10000);
-      expect(cache.maxAge).toBe(10000);
-    });
-
-    it('respects specified options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache({
-        ttlSeconds: 3,
-        maxSize: 10,
-      });
-      expect(cache.max).toBe(10);
-      expect(cache.maxAge).toBe(3000);
-    });
+function createTTLCache<TFields extends Record<string, any>>(): ILocalMemoryCache<TFields> {
+  return new TTLCache<string, LocalMemoryCacheValue<TFields>>({
+    max: 10000,
+    ttl: 10 * 1000, // convert to ms
+    updateAgeOnGet: true,
   });
-
-  describe(GenericLocalMemoryCacher.createNoOpCache, () => {
-    it('creates a no-op cache', () => {
-      const cache = GenericLocalMemoryCacher.createNoOpCache<{ hello: 'world' }>();
-      cache.set('a', { hello: 'world' });
-      expect(cache.get('a')).toBeUndefined();
-    });
-  });
-});
+}
 
 describe('Use within GenericEntityCacheAdapter', () => {
   describe('loadManyAsync', () => {
     it('returns appropriate cache results', async () => {
       const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache(),
-        ),
+        new GenericLocalMemoryCacher(entityConfiguration, createTTLCache()),
       );
 
       const cacheHits = new Map<SingleFieldValueHolder<BlahFields, 'id'>, Readonly<BlahFields>>([
@@ -97,10 +78,7 @@ describe('Use within GenericEntityCacheAdapter', () => {
 
     it('returns empty map when passed empty array of values', async () => {
       const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache(),
-        ),
+        new GenericLocalMemoryCacher(entityConfiguration, createTTLCache()),
       );
       const results = await cacheAdapter.loadManyAsync(
         new SingleFieldHolder<BlahFields, 'id', 'id'>('id'),
@@ -112,7 +90,7 @@ describe('Use within GenericEntityCacheAdapter', () => {
 
   describe('cacheManyAsync', () => {
     it('correctly caches all objects', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = createTTLCache<BlahFields>();
 
       const localMemoryCacher = new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache);
       const cacheAdapter = new GenericEntityCacheAdapter(localMemoryCacher);
@@ -133,7 +111,7 @@ describe('Use within GenericEntityCacheAdapter', () => {
 
   describe('cacheDBMissesAsync', () => {
     it('correctly caches misses', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = createTTLCache<BlahFields>();
 
       const localMemoryCacher = new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache);
       const cacheAdapter = new GenericEntityCacheAdapter(localMemoryCacher);
@@ -151,7 +129,7 @@ describe('Use within GenericEntityCacheAdapter', () => {
 
   describe('invalidateManyAsync', () => {
     it('invalidates correctly', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = createTTLCache<BlahFields>();
 
       const cacheAdapter = new GenericEntityCacheAdapter(
         new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache),
@@ -182,10 +160,7 @@ describe('Use within GenericEntityCacheAdapter', () => {
 
     it('returns when passed empty array of values', async () => {
       const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache<BlahFields>({}),
-        ),
+        new GenericLocalMemoryCacher(entityConfiguration, createTTLCache<BlahFields>()),
       );
       await cacheAdapter.invalidateManyAsync(
         new SingleFieldHolder<BlahFields, 'id', 'id'>('id'),