effect 2.3.6 → 2.3.8

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "effect",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "Functional programming in TypeScript",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/effect-ts/effect.git"
+    "url": "https://github.com/effect-ts/effect.git",
+    "directory": "packages/effect"
   },
   "sideEffects": [],
   "main": "./dist/cjs/index.js",
@@ -348,6 +349,11 @@
       "import": "./dist/esm/MetricState.js",
       "default": "./dist/cjs/MetricState.js"
     },
+    "./ModuleVersion": {
+      "types": "./dist/dts/ModuleVersion.d.ts",
+      "import": "./dist/esm/ModuleVersion.js",
+      "default": "./dist/cjs/ModuleVersion.js"
+    },
     "./MutableHashMap": {
       "types": "./dist/dts/MutableHashMap.d.ts",
       "import": "./dist/esm/MutableHashMap.js",
@@ -964,6 +970,9 @@
       "MetricState": [
         "./dist/dts/MetricState.d.ts"
       ],
+      "ModuleVersion": [
+        "./dist/dts/ModuleVersion.d.ts"
+      ],
       "MutableHashMap": [
         "./dist/dts/MutableHashMap.d.ts"
       ],

package/src/BigDecimal.ts

@@ -57,7 +57,8 @@ const BigDecimalProto: Omit<BigDecimal, "value" | "scale" | "normalized"> = {
     const normalized = normalize(this)
     return pipe(
       Hash.hash(normalized.value),
-      Hash.combine(Hash.number(normalized.scale))
+      Hash.combine(Hash.number(normalized.scale)),
+      Hash.cached(this)
     )
   },
   [Equal.symbol](this: BigDecimal, that: unknown): boolean {

package/src/Chunk.ts

@@ -142,7 +142,7 @@ const ChunkProto: Omit<Chunk<unknown>, "backing" | "depth" | "left" | "length" |
     return isChunk(that) && _equivalence(this, that)
   },
   [Hash.symbol]<A>(this: Chunk<A>): number {
-    return Hash.array(toReadonlyArray(this))
+    return Hash.cached(this, Hash.array(toReadonlyArray(this)))
   },
   [Symbol.iterator]<A>(this: Chunk<A>): Iterator<A> {
     switch (this.backing._tag) {

package/src/Cron.ts

@@ -50,7 +50,8 @@ const CronProto: Omit<Cron, "minutes" | "hours" | "days" | "months" | "weekdays"
       Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.hours))),
       Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.days))),
       Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.months))),
-      Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.weekdays)))
+      Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.weekdays))),
+      Hash.cached(this)
     )
   },
   toString(this: Cron) {

package/src/Duration.ts

@@ -116,8 +116,8 @@ const infinityValue: DurationValue = { _tag: "Infinity" }
 
 const DurationProto: Omit<Duration, "value"> = {
   [TypeId]: TypeId,
-  [Hash.symbol](this: Duration): number {
-    return Hash.structure(this.value)
+  [Hash.symbol](this: Duration) {
+    return Hash.cached(this, Hash.structure(this.value))
   },
   [Equal.symbol](this: Duration, that: unknown): boolean {
     return isDuration(that) && equals(this, that)

package/src/FiberMap.ts

@@ -7,7 +7,6 @@ import type { NoSuchElementException } from "./Cause.js"
 import * as Fiber from "./Fiber.js"
 import * as FiberId from "./FiberId.js"
 import { dual } from "./Function.js"
-import type { FiberMap } from "./index.js"
 import * as Inspectable from "./Inspectable.js"
 import * as MutableHashMap from "./MutableHashMap.js"
 import * as Option from "./Option.js"

package/src/GlobalValue.ts

@@ -1,9 +1,9 @@
 /**
  * @since 2.0.0
  */
-import { moduleVersion } from "./internal/version.js"
+import * as version from "./internal/version.js"
 
-const globalStoreId = Symbol.for(`effect/GlobalValue/globalStoreId/${moduleVersion}`)
+const globalStoreId = Symbol.for(`effect/GlobalValue/globalStoreId/${version.getCurrentVersion()}`)
 
 if (!(globalStoreId in globalThis)) {
   ;(globalThis as any)[globalStoreId] = new Map()

package/src/Hash.ts

@@ -156,3 +156,34 @@ export const array = <A>(arr: ReadonlyArray<A>) => {
   }
   return optimize(h)
 }
+
+/**
+ * @since 2.0.0
+ * @category hashing
+ */
+export const cached: {
+  (self: object): (hash: number) => number
+  (self: object, hash: number): number
+} = function() {
+  if (arguments.length === 1) {
+    const self = arguments[0] as object
+    return function(hash: number) {
+      Object.defineProperty(self, symbol, {
+        value() {
+          return hash
+        },
+        enumerable: false
+      })
+      return hash
+    } as any
+  }
+  const self = arguments[0] as object
+  const hash = arguments[1] as number
+  Object.defineProperty(self, symbol, {
+    value() {
+      return hash
+    },
+    enumerable: false
+  })
+  return hash
+}

package/src/List.ts

@@ -118,7 +118,7 @@ const ConsProto: Omit<Cons<unknown>, "head" | "tail"> = {
       _equivalence(this, that)
   },
   [Hash.symbol](this: Cons<unknown>): number {
-    return Hash.array(toArray(this))
+    return Hash.cached(this, Hash.array(toArray(this)))
   },
   [Symbol.iterator](this: Cons<unknown>): Iterator<unknown> {
     let done = false
@@ -162,6 +162,7 @@ const makeCons = <A>(head: A, tail: List<A>): MutableCons<A> => {
   return cons
 }
 
+const NilHash = Hash.string("Nil")
 const NilProto: Nil<unknown> = {
   [TypeId]: TypeId,
   _tag: "Nil",
@@ -178,7 +179,7 @@ const NilProto: Nil<unknown> = {
     return this.toJSON()
   },
   [Hash.symbol](): number {
-    return Hash.array(toArray(this))
+    return NilHash
   },
   [Equal.symbol](that: unknown): boolean {
     return isList(that) && this._tag === that._tag

package/src/ModuleVersion.ts

@@ -0,0 +1,18 @@
+/**
+ * @since 2.0.0
+ *
+ * Enables low level framework authors to run on their own isolated effect version
+ */
+import * as internal from "./internal/version.js"
+
+/**
+ * @since 2.0.0
+ * @category version
+ */
+export const getCurrentVersion: () => string = internal.getCurrentVersion
+
+/**
+ * @since 2.0.0
+ * @category version
+ */
+export const setCurrentVersion: (version: string) => void = internal.setCurrentVersion

package/src/SortedMap.ts

@@ -41,7 +41,11 @@ const SortedMapProto: Omit<SortedMap<unknown, unknown>, "tree"> = {
     _V: (_: never) => _
   },
   [Hash.symbol]<K, V>(this: SortedMap<K, V>): number {
-    return pipe(Hash.hash(this.tree), Hash.combine(Hash.hash("effect/SortedMap")))
+    return pipe(
+      Hash.hash(this.tree),
+      Hash.combine(Hash.hash("effect/SortedMap")),
+      Hash.cached(this)
+    )
   },
   [Equal.symbol]<K, V>(this: SortedMap<K, V>, that: unknown): boolean {
     return isSortedMap(that) && Equal.equals(this.tree, that.tree)

package/src/SortedSet.ts

@@ -40,7 +40,11 @@ const SortedSetProto: Omit<SortedSet<unknown>, "keyTree"> = {
     _A: (_: any) => _
   },
   [Hash.symbol]<A>(this: SortedSet<A>): number {
-    return pipe(Hash.hash(this.keyTree), Hash.combine(Hash.hash(TypeId)))
+    return pipe(
+      Hash.hash(this.keyTree),
+      Hash.combine(Hash.hash(TypeId)),
+      Hash.cached(this)
+    )
   },
   [Equal.symbol]<A>(this: SortedSet<A>, that: unknown): boolean {
     return isSortedSet(that) && Equal.equals(this.keyTree, that.keyTree)

package/src/TestAnnotation.ts

@@ -51,7 +51,8 @@ class TestAnnotationImpl<A> implements Equal.Equal {
   [Hash.symbol](): number {
     return pipe(
       Hash.hash(TestAnnotationSymbolKey),
-      Hash.combine(Hash.hash(this.identifier))
+      Hash.combine(Hash.hash(this.identifier)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {

package/src/index.ts

@@ -455,6 +455,13 @@ export * as MetricRegistry from "./MetricRegistry.js"
  */
 export * as MetricState from "./MetricState.js"
 
+/**
+ * @since 2.0.0
+ *
+ * Enables low level framework authors to run on their own isolated effect version
+ */
+export * as ModuleVersion from "./ModuleVersion.js"
+
 /**
  * @since 2.0.0
  */

package/src/internal/cache.ts

@@ -123,7 +123,8 @@ class MapKeyImpl<out K> implements MapKey<K> {
     return pipe(
       Hash.hash(this.current),
       Hash.combine(Hash.hash(this.previous)),
-      Hash.combine(Hash.hash(this.next))
+      Hash.combine(Hash.hash(this.next)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {
@@ -551,11 +552,11 @@ class CacheImpl<in out Key, in out Error, in out Value> implements Cache.Cache<K
       switch (value._tag) {
         case "Complete": {
           this.trackAccess(value.key)
-          this.trackHit()
           if (this.hasExpired(clock, value.timeToLiveMillis)) {
             MutableHashMap.remove(this.cacheState.map, value.key.current)
             return core.succeed(Option.none<Value>())
           }
+          this.trackHit()
           return core.map(value.exit, Option.some)
         }
         case "Pending": {

package/src/internal/cause.ts

@@ -39,7 +39,8 @@ const proto = {
   [Hash.symbol](this: Cause.Cause<any>): number {
     return pipe(
       Hash.hash(CauseSymbolKey),
-      Hash.combine(Hash.hash(flattenCause(this)))
+      Hash.combine(Hash.hash(flattenCause(this))),
+      Hash.cached(this)
     )
   },
   [Equal.symbol](this: Cause.Cause<any>, that: unknown): boolean {

package/src/internal/context.ts

@@ -111,7 +111,7 @@ export const ContextProto: Omit<C.Context<unknown>, "unsafeMap"> = {
     return false
   },
   [Hash.symbol]<A>(this: C.Context<A>): number {
-    return Hash.number(this.unsafeMap.size)
+    return Hash.cached(this, Hash.number(this.unsafeMap.size))
   },
   pipe<A>(this: C.Context<A>) {
     return pipeArguments(this, arguments)

package/src/internal/core.ts

@@ -158,7 +158,7 @@ class EffectPrimitive {
     return this === that
   }
   [Hash.symbol](this: {}) {
-    return Hash.random(this)
+    return Hash.cached(this, Hash.random(this))
   }
   pipe() {
     return pipeArguments(this, arguments)
@@ -195,7 +195,7 @@ class EffectPrimitiveFailure {
     return this === that
   }
   [Hash.symbol](this: {}) {
-    return Hash.random(this)
+    return Hash.cached(this, Hash.random(this))
   }
   get cause() {
     return this.i0
@@ -233,7 +233,7 @@ class EffectPrimitiveSuccess {
     return this === that
   }
   [Hash.symbol](this: {}) {
-    return Hash.random(this)
+    return Hash.cached(this, Hash.random(this))
   }
   get value() {
     return this.i0
@@ -1734,7 +1734,7 @@ export class RequestResolverImpl<out R, in A> implements RequestResolver.Request
     this.runAll = runAll as any
   }
   [Hash.symbol](): number {
-    return this.target ? Hash.hash(this.target) : Hash.random(this)
+    return Hash.cached(this, this.target ? Hash.hash(this.target) : Hash.random(this))
   }
   [Equal.symbol](that: unknown): boolean {
     return this.target ?

package/src/internal/data.ts

@@ -6,7 +6,7 @@ import { StructuralPrototype } from "./effectable.js"
 /** @internal */
 export const ArrayProto: Equal.Equal = Object.assign(Object.create(Array.prototype), {
   [Hash.symbol](this: Array<any>) {
-    return Hash.array(this)
+    return Hash.cached(this, Hash.array(this))
   },
   [Equal.symbol](this: Array<any>, that: Equal.Equal) {
     if (Array.isArray(that) && this.length === that.length) {

package/src/internal/effect/circular.ts

@@ -315,7 +315,7 @@ class Key<in out A> implements Equal.Equal {
     return false
   }
   [Hash.symbol]() {
-    return this.eq ? 0 : Hash.hash(this.a)
+    return this.eq ? 0 : Hash.cached(this, Hash.hash(this.a))
   }
 }
 

package/src/internal/effectable.ts

@@ -7,7 +7,7 @@ import { pipeArguments } from "../Pipeable.js"
 import type * as Sink from "../Sink.js"
 import type * as Stream from "../Stream.js"
 import * as OpCodes from "./opCodes/effect.js"
-import { moduleVersion } from "./version.js"
+import * as version from "./version.js"
 
 /** @internal */
 export const EffectTypeId: Effect.EffectTypeId = Symbol.for("effect/Effect") as Effect.EffectTypeId
@@ -30,7 +30,7 @@ export const effectVariance = {
   /* c8 ignore next */
   _A: (_: never) => _,
 
-  _V: moduleVersion
+  _V: version.getCurrentVersion()
 }
 
 const sinkVariance = {
@@ -73,7 +73,7 @@ export const EffectPrototype: Effect.Effect<never> & Equal.Equal = {
     return this === that
   },
   [Hash.symbol]() {
-    return Hash.random(this)
+    return Hash.cached(this, Hash.random(this))
   },
   pipe() {
     return pipeArguments(this, arguments)
@@ -82,8 +82,8 @@ export const EffectPrototype: Effect.Effect<never> & Equal.Equal = {
 
 /** @internal */
 export const StructuralPrototype: Equal.Equal = {
-  [Hash.symbol](this: Equal.Equal) {
-    return Hash.structure(this)
+  [Hash.symbol]() {
+    return Hash.cached(this, Hash.structure(this))
   },
   [Equal.symbol](this: Equal.Equal, that: Equal.Equal) {
     const selfKeys = Object.keys(this)

package/src/internal/either.ts

@@ -37,7 +37,7 @@ const RightProto = Object.assign(Object.create(CommonProto), {
     return isEither(that) && isRight(that) && Equal.equals(that.right, this.right)
   },
   [Hash.symbol]<E, A>(this: Either.Right<E, A>) {
-    return Hash.combine(Hash.hash(this._tag))(Hash.hash(this.right))
+    return Hash.cached(this, Hash.combine(Hash.hash(this._tag))(Hash.hash(this.right)))
   },
   toJSON<E, A>(this: Either.Right<E, A>) {
     return {
@@ -55,7 +55,7 @@ const LeftProto = Object.assign(Object.create(CommonProto), {
     return isEither(that) && isLeft(that) && Equal.equals(that.left, this.left)
   },
   [Hash.symbol]<E, A>(this: Either.Left<E, A>) {
-    return Hash.combine(Hash.hash(this._tag))(Hash.hash(this.left))
+    return Hash.cached(this, Hash.combine(Hash.hash(this._tag))(Hash.hash(this.left)))
   },
   toJSON<E, A>(this: Either.Left<E, A>) {
     return {

package/src/internal/fiberId.ts

@@ -71,12 +71,8 @@ class Runtime implements FiberId.Runtime {
     readonly id: number,
     readonly startTimeMillis: number
   ) {}
-  _hash: number | undefined;
   [Hash.symbol](): number {
-    if (this._hash == undefined) {
-      this._hash = Hash.string(`${FiberIdSymbolKey}-${this._tag}-${this.id}-${this.startTimeMillis}`)
-    }
-    return this._hash
+    return Hash.cached(this, Hash.string(`${FiberIdSymbolKey}-${this._tag}-${this.id}-${this.startTimeMillis}`))
   }
   [Equal.symbol](that: unknown): boolean {
     return isFiberId(that) &&
@@ -111,14 +107,12 @@ class Composite implements FiberId.Composite {
   }
   _hash: number | undefined;
   [Hash.symbol](): number {
-    if (this._hash == undefined) {
-      this._hash = pipe(
-        Hash.string(`${FiberIdSymbolKey}-${this._tag}`),
-        Hash.combine(Hash.hash(this.left)),
-        Hash.combine(Hash.hash(this.right))
-      )
-    }
-    return this._hash
+    return pipe(
+      Hash.string(`${FiberIdSymbolKey}-${this._tag}`),
+      Hash.combine(Hash.hash(this.left)),
+      Hash.combine(Hash.hash(this.right)),
+      Hash.cached(this)
+    )
   }
   [Equal.symbol](that: unknown): boolean {
     return isFiberId(that) &&

package/src/internal/fiberRuntime.ts

@@ -67,7 +67,7 @@ import { OpSupervision } from "./runtimeFlags.js"
 import * as supervisor from "./supervisor.js"
 import * as SupervisorPatch from "./supervisor/patch.js"
 import * as tracer from "./tracer.js"
-import { moduleVersion } from "./version.js"
+import * as version from "./version.js"
 
 /** @internal */
 export const fiberStarted = metric.counter("effect_fiber_started")
@@ -1287,11 +1287,11 @@ export class FiberRuntime<in out A, in out E = never> implements Fiber.RuntimeFi
         // @ts-expect-error
         cur = this._tracer.context(
           () => {
-            if (moduleVersion !== (cur as core.Primitive)[EffectTypeId]._V) {
+            if (version.getCurrentVersion() !== (cur as core.Primitive)[EffectTypeId]._V) {
               return core.dieMessage(
                 `Cannot execute an Effect versioned ${
                   (cur as core.Primitive)[EffectTypeId]._V
-                } with a Runtime of version ${moduleVersion}`
+                } with a Runtime of version ${version.getCurrentVersion()}`
               )
             }
             // @ts-expect-error

package/src/internal/fiberStatus.ts

@@ -31,15 +31,14 @@ export const OP_SUSPENDED = "Suspended" as const
 /** @internal */
 export type OP_SUSPENDED = typeof OP_SUSPENDED
 
+const DoneHash = Hash.string(`${FiberStatusSymbolKey}-${OP_DONE}`)
+
 /** @internal */
 class Done implements FiberStatus.Done {
   readonly [FiberStatusTypeId]: FiberStatus.FiberStatusTypeId = FiberStatusTypeId
   readonly _tag = OP_DONE;
   [Hash.symbol](): number {
-    return pipe(
-      Hash.hash(FiberStatusSymbolKey),
-      Hash.combine(Hash.hash(this._tag))
-    )
+    return DoneHash
   }
   [Equal.symbol](that: unknown): boolean {
     return isFiberStatus(that) && that._tag === OP_DONE
@@ -55,7 +54,8 @@ class Running implements FiberStatus.Running {
     return pipe(
       Hash.hash(FiberStatusSymbolKey),
       Hash.combine(Hash.hash(this._tag)),
-      Hash.combine(Hash.hash(this.runtimeFlags))
+      Hash.combine(Hash.hash(this.runtimeFlags)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {
@@ -80,7 +80,8 @@ class Suspended implements FiberStatus.Suspended {
       Hash.hash(FiberStatusSymbolKey),
       Hash.combine(Hash.hash(this._tag)),
       Hash.combine(Hash.hash(this.runtimeFlags)),
-      Hash.combine(Hash.hash(this.blockingOn))
+      Hash.combine(Hash.hash(this.blockingOn)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {

package/src/internal/hashMap.ts

@@ -47,12 +47,12 @@ const HashMapProto: HM.HashMap<unknown, unknown> = {
   [Symbol.iterator]<K, V>(this: HashMapImpl<K, V>): Iterator<[K, V]> {
     return new HashMapIterator(this, (k, v) => [k, v])
   },
-  [Hash.symbol](): number {
+  [Hash.symbol](this: HM.HashMap<unknown, unknown>): number {
     let hash = Hash.hash(HashMapSymbolKey)
     for (const item of this) {
       hash ^= pipe(Hash.hash(item[0]), Hash.combine(Hash.hash(item[1])))
     }
-    return hash
+    return Hash.cached(this, hash)
   },
   [Equal.symbol]<K, V>(this: HashMapImpl<K, V>, that: unknown): boolean {
     if (isHashMap(that)) {

package/src/internal/hashSet.ts

@@ -26,7 +26,10 @@ const HashSetProto: Omit<HashSetImpl<unknown>, "_keyMap"> = {
     return HM.keys(this._keyMap)
   },
   [Hash.symbol]<A>(this: HashSetImpl<A>): number {
-    return Hash.combine(Hash.hash(this._keyMap))(Hash.hash(HashSetSymbolKey))
+    return Hash.cached(
+      this,
+      Hash.combine(Hash.hash(this._keyMap))(Hash.hash(HashSetSymbolKey))
+    )
   },
   [Equal.symbol]<A>(this: HashSetImpl<A>, that: unknown): boolean {
     if (isHashSet(that)) {

package/src/internal/keyedPool.ts

@@ -62,7 +62,8 @@ class Complete<in out A, out E> implements Equal.Equal {
   [Hash.symbol](): number {
     return pipe(
       Hash.string("effect/KeyedPool/Complete"),
-      Hash.combine(Hash.hash(this.pool))
+      Hash.combine(Hash.hash(this.pool)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](u: unknown): boolean {
@@ -80,7 +81,8 @@ class Pending<in out A, in out E> implements Equal.Equal {
   [Hash.symbol](): number {
     return pipe(
       Hash.string("effect/KeyedPool/Pending"),
-      Hash.combine(Hash.hash(this.deferred))
+      Hash.combine(Hash.hash(this.deferred)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](u: unknown): boolean {

package/src/internal/metric/keyType.ts

@@ -81,13 +81,14 @@ class CounterKeyType<A extends (number | bigint)> implements MetricKeyType.Metri
   }
 }
 
+const FrequencyKeyTypeHash = Hash.string(FrequencyKeyTypeSymbolKey)
+
 /** @internal */
 class FrequencyKeyType implements MetricKeyType.MetricKeyType.Frequency {
   readonly [MetricKeyTypeTypeId] = metricKeyTypeVariance
-  readonly [FrequencyKeyTypeTypeId]: MetricKeyType.FrequencyKeyTypeTypeId = FrequencyKeyTypeTypeId
-  readonly _hash = Hash.string(FrequencyKeyTypeSymbolKey);
+  readonly [FrequencyKeyTypeTypeId]: MetricKeyType.FrequencyKeyTypeTypeId = FrequencyKeyTypeTypeId;
   [Hash.symbol](): number {
-    return this._hash
+    return FrequencyKeyTypeHash
   }
   [Equal.symbol](that: unknown): boolean {
     return isFrequencyKey(that)
@@ -97,14 +98,15 @@ class FrequencyKeyType implements MetricKeyType.MetricKeyType.Frequency {
   }
 }
 
+const GaugeKeyTypeHash = Hash.string(GaugeKeyTypeSymbolKey)
+
 /** @internal */
 class GaugeKeyType<A extends (number | bigint)> implements MetricKeyType.MetricKeyType.Gauge<A> {
   readonly [MetricKeyTypeTypeId] = metricKeyTypeVariance
   readonly [GaugeKeyTypeTypeId]: MetricKeyType.GaugeKeyTypeTypeId = GaugeKeyTypeTypeId
   constructor(readonly bigint: boolean) {}
-  readonly _hash = Hash.string(GaugeKeyTypeSymbolKey);
   [Hash.symbol](): number {
-    return this._hash
+    return GaugeKeyTypeHash
   }
   [Equal.symbol](that: unknown): boolean {
     return isGaugeKey(that)

package/src/internal/metric/state.ts

@@ -68,7 +68,8 @@ class CounterState<A extends (number | bigint)> implements MetricState.MetricSta
   [Hash.symbol](): number {
     return pipe(
       Hash.hash(CounterStateSymbolKey),
-      Hash.combine(Hash.hash(this.count))
+      Hash.combine(Hash.hash(this.count)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {
@@ -88,14 +89,11 @@ class FrequencyState implements MetricState.MetricState.Frequency {
   constructor(readonly occurrences: ReadonlyMap<string, number>) {}
   _hash: number | undefined;
   [Hash.symbol](): number {
-    if (this._hash !== undefined) {
-      return this._hash
-    }
-    this._hash = pipe(
+    return pipe(
       Hash.string(FrequencyStateSymbolKey),
-      Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.occurrences.entries())))
+      Hash.combine(Hash.array(ReadonlyArray.fromIterable(this.occurrences.entries()))),
+      Hash.cached(this)
     )
-    return this._hash
   }
   [Equal.symbol](that: unknown): boolean {
     return isFrequencyState(that) && arrayEquals(
@@ -116,7 +114,8 @@ class GaugeState<A extends (number | bigint)> implements MetricState.MetricState
   [Hash.symbol](): number {
     return pipe(
       Hash.hash(GaugeStateSymbolKey),
-      Hash.combine(Hash.hash(this.value))
+      Hash.combine(Hash.hash(this.value)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](u: unknown): boolean {
@@ -145,7 +144,8 @@ export class HistogramState implements MetricState.MetricState.Histogram {
       Hash.combine(Hash.hash(this.count)),
       Hash.combine(Hash.hash(this.min)),
       Hash.combine(Hash.hash(this.max)),
-      Hash.combine(Hash.hash(this.sum))
+      Hash.combine(Hash.hash(this.sum)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {
@@ -181,7 +181,8 @@ export class SummaryState implements MetricState.MetricState.Summary {
       Hash.combine(Hash.hash(this.count)),
       Hash.combine(Hash.hash(this.min)),
       Hash.combine(Hash.hash(this.max)),
-      Hash.combine(Hash.hash(this.sum))
+      Hash.combine(Hash.hash(this.sum)),
+      Hash.cached(this)
     )
   }
   [Equal.symbol](that: unknown): boolean {