@ember-data/store 4.2.0-beta.0 → 4.3.0

package/addon/-private/system/references/has-many.ts

@@ -4,7 +4,6 @@ import { cached, tracked } from '@glimmer/tracking';
 
 import { resolve } from 'rsvp';
 
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import type { ManyRelationship } from '@ember-data/record-data/-private';
 import { assertPolymorphicType } from '@ember-data/store/-debug';
 
@@ -18,8 +17,7 @@ import CoreStore from '../core-store';
 import { NotificationType, unsubscribe } from '../record-notification-manager';
 import { internalModelFactoryFor, recordIdentifierFor } from '../store/internal-model-factory';
 import RecordReference from './record';
-import Reference, { internalModelForReference } from './reference';
-
+import Reference from './reference';
 /**
   @module @ember-data/store
 */
@@ -37,10 +35,10 @@ export default class HasManyReference extends Reference {
   declare hasManyRelationship: ManyRelationship;
   declare type: string;
   declare parent: RecordReference;
-  declare parentIdentifier: StableRecordIdentifier;
 
   // unsubscribe tokens given to us by the notification manager
   #token!: Object;
+  #identifier: StableRecordIdentifier;
   #relatedTokenMap!: Map<StableRecordIdentifier, Object>;
 
   @tracked _ref = 0;
@@ -57,29 +55,25 @@ export default class HasManyReference extends Reference {
     this.type = hasManyRelationship.definition.type;
 
     this.parent = internalModelFactoryFor(store).peek(parentIdentifier)!.recordReference;
-
-    if (CUSTOM_MODEL_CLASS) {
-      this.#token = store._notificationManager.subscribe(
-        parentIdentifier,
-        (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
-          if ((bucket === 'relationships' || bucket === 'property') && notifiedKey === key) {
-            this._ref++;
-          }
+    this.#identifier = parentIdentifier;
+    this.#token = store._notificationManager.subscribe(
+      parentIdentifier,
+      (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
+        if ((bucket === 'relationships' || bucket === 'property') && notifiedKey === key) {
+          this._ref++;
         }
-      );
-      this.#relatedTokenMap = new Map();
-    }
+      }
+    );
+    this.#relatedTokenMap = new Map();
     // TODO inverse
   }
 
   destroy() {
-    if (CUSTOM_MODEL_CLASS) {
-      unsubscribe(this.#token);
-      this.#relatedTokenMap.forEach((token) => {
-        unsubscribe(token);
-      });
-      this.#relatedTokenMap.clear();
-    }
+    unsubscribe(this.#token);
+    this.#relatedTokenMap.forEach((token) => {
+      unsubscribe(token);
+    });
+    this.#relatedTokenMap.clear();
   }
 
   @cached
@@ -206,21 +200,7 @@ export default class HasManyReference extends Reference {
    @return {Array} The ids in this has-many relationship
    */
   ids(): Array<string | null> {
-    if (CUSTOM_MODEL_CLASS) {
-      return this._relatedIdentifiers.map((identifier) => identifier.id);
-    }
-
-    let resource = this._resource();
-
-    if (resource && resource.data) {
-      return resource.data.map((resourceIdentifier) => {
-        const identifier = this.store.identifierCache.getOrCreateRecordIdentifier(resourceIdentifier);
-
-        return identifier.id;
-      });
-    }
-
-    return [];
+    return this._relatedIdentifiers.map((identifier) => identifier.id);
   }
 
   /**
@@ -280,7 +260,7 @@ export default class HasManyReference extends Reference {
       array = payload as ExistingResourceObject[];
     }
 
-    const internalModel = internalModelForReference(this)!;
+    const internalModel = internalModelFactoryFor(this.store).peek(this.#identifier)!;
     const { store } = this;
 
     let identifiers = array.map((obj) => {
@@ -371,7 +351,7 @@ export default class HasManyReference extends Reference {
    @return {ManyArray}
    */
   value() {
-    let internalModel = internalModelForReference(this)!;
+    const internalModel = internalModelFactoryFor(this.store).peek(this.#identifier)!;
     if (this._isLoaded()) {
       return internalModel.getManyArray(this.key);
     }
@@ -444,7 +424,7 @@ export default class HasManyReference extends Reference {
    this has-many relationship.
    */
   load(options) {
-    let internalModel = internalModelForReference(this)!;
+    const internalModel = internalModelFactoryFor(this.store).peek(this.#identifier)!;
     return internalModel.getHasMany(this.key, options);
   }
 
@@ -499,7 +479,7 @@ export default class HasManyReference extends Reference {
    @return {Promise} a promise that resolves with the ManyArray in this has-many relationship.
    */
   reload(options) {
-    let internalModel = internalModelForReference(this)!;
+    const internalModel = internalModelFactoryFor(this.store).peek(this.#identifier)!;
     return internalModel.reloadHasMany(this.key, options);
   }
 }

package/addon/-private/system/references/record.ts

@@ -3,15 +3,13 @@ import { cached, tracked } from '@glimmer/tracking';
 
 import RSVP, { resolve } from 'rsvp';
 
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
-
 import type { SingleResourceDocument } from '../../ts-interfaces/ember-data-json-api';
 import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
 import type { RecordInstance } from '../../ts-interfaces/record-instance';
 import type CoreStore from '../core-store';
 import { NotificationType, unsubscribe } from '../record-notification-manager';
-import Reference, { internalModelForReference, REFERENCE_CACHE } from './reference';
-
+import { internalModelFactoryFor } from '../store/internal-model-factory';
+import Reference from './reference';
 /**
   @module @ember-data/store
 */
@@ -27,27 +25,25 @@ import Reference, { internalModelForReference, REFERENCE_CACHE } from './referen
 export default class RecordReference extends Reference {
   // unsubscribe token given to us by the notification manager
   #token!: Object;
+  #identifier;
 
   @tracked _ref = 0;
 
   constructor(public store: CoreStore, identifier: StableRecordIdentifier) {
     super(store, identifier);
-    if (CUSTOM_MODEL_CLASS) {
-      this.#token = store._notificationManager.subscribe(
-        identifier,
-        (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
-          if (bucket === 'identity' || ((bucket === 'attributes' || bucket === 'property') && notifiedKey === 'id')) {
-            this._ref++;
-          }
+    this.#identifier = identifier;
+    this.#token = store._notificationManager.subscribe(
+      identifier,
+      (_: StableRecordIdentifier, bucket: NotificationType, notifiedKey?: string) => {
+        if (bucket === 'identity' || ((bucket === 'attributes' || bucket === 'property') && notifiedKey === 'id')) {
+          this._ref++;
         }
-      );
-    }
+      }
+    );
   }
 
   destroy() {
-    if (CUSTOM_MODEL_CLASS) {
-      unsubscribe(this.#token);
-    }
+    unsubscribe(this.#token);
   }
 
   public get type(): string {
@@ -85,15 +81,7 @@ export default class RecordReference extends Reference {
      @return {String} The id of the record.
   */
   id() {
-    if (CUSTOM_MODEL_CLASS) {
-      return this._id;
-    }
-    let identifier = this.identifier();
-    if (identifier) {
-      return identifier.id;
-    }
-
-    return null;
+    return this._id;
   }
 
   /**
@@ -115,7 +103,7 @@ export default class RecordReference extends Reference {
      @return {String} The identifier of the record.
   */
   identifier(): StableRecordIdentifier {
-    return REFERENCE_CACHE.get(this) as StableRecordIdentifier;
+    return this.#identifier;
   }
 
   /**
@@ -203,7 +191,7 @@ export default class RecordReference extends Reference {
   */
   value(): RecordInstance | null {
     if (this.id() !== null) {
-      let internalModel = internalModelForReference(this);
+      let internalModel = internalModelFactoryFor(this.store).peek(this.#identifier);
       if (internalModel && internalModel.currentState.isLoaded) {
         return internalModel.getRecord();
       }

package/addon/-private/system/references/reference.ts

@@ -5,9 +5,6 @@ import type { StableRecordIdentifier } from '../../ts-interfaces/identifier';
 import type { JsonApiRelationship } from '../../ts-interfaces/record-data-json-api';
 import type { Dict } from '../../ts-interfaces/utils';
 import type CoreStore from '../core-store';
-import type InternalModel from '../model/internal-model';
-import { internalModelFactoryFor } from '../store/internal-model-factory';
-
 /**
   @module @ember-data/store
 */
@@ -25,12 +22,6 @@ function isResourceIdentiferWithRelatedLinks(
   return value && value.links && value.links.related;
 }
 
-export const REFERENCE_CACHE = new WeakMap<Reference, StableRecordIdentifier>();
-
-export function internalModelForReference(reference: Reference): InternalModel | null | undefined {
-  return internalModelFactoryFor(reference.store).peek(REFERENCE_CACHE.get(reference) as StableRecordIdentifier);
-}
-
 /**
   This is the baseClass for the different References
   like RecordReference/HasManyReference/BelongsToReference
@@ -42,12 +33,14 @@ interface Reference {
   links(): PaginationLinks | null;
 }
 abstract class Reference {
+  #identifier: StableRecordIdentifier;
+
   constructor(public store: CoreStore, identifier: StableRecordIdentifier) {
-    REFERENCE_CACHE.set(this, identifier);
+    this.#identifier = identifier;
   }
 
   get recordData() {
-    return this.store.recordDataFor(REFERENCE_CACHE.get(this) as StableRecordIdentifier, false);
+    return this.store.recordDataFor(this.#identifier, false);
   }
 
   public _resource(): ResourceIdentifier | JsonApiRelationship | void {}

package/addon/-private/system/schema-definition-service.ts

@@ -32,7 +32,7 @@ export class DSModelSchemaDefinitionService {
   constructor(public store: Store) {}
 
   // Following the existing RD implementation
-  attributesDefinitionFor(identifier: RecordIdentifier | string): AttributesSchema {
+  attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
     let modelName, attributes;
     if (typeof identifier === 'string') {
       modelName = identifier;
@@ -55,7 +55,7 @@ export class DSModelSchemaDefinitionService {
   }
 
   // Following the existing RD implementation
-  relationshipsDefinitionFor(identifier: RecordIdentifier | string): RelationshipsSchema {
+  relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }): RelationshipsSchema {
     let modelName, relationships;
     if (typeof identifier === 'string') {
       modelName = identifier;

package/addon/-private/system/snapshot.ts

@@ -4,7 +4,6 @@
 import { assert } from '@ember/debug';
 import { get } from '@ember/object';
 
-import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
 
 import type { DSModel, DSModelSchema, ModelSchema } from '../ts-interfaces/ds-model';
@@ -65,10 +64,15 @@ export default class Snapshot implements Snapshot {
     let internalModel = (this._internalModel = _store._internalModelForResource(identifier));
     this.modelName = identifier.type;
 
-    if (CUSTOM_MODEL_CLASS) {
-      // TODO add public docs once this FF is on
-      this.identifier = identifier;
-    }
+    /**
+      The unique RecordIdentifier associated with this Snapshot.
+
+      @property identifier
+      @public
+      @type {StableRecordIdentifier}
+    */
+    this.identifier = identifier;
+
     /*
       If the internalModel does not yet have a record, then we are
       likely a snapshot being provided to a find request, so we
@@ -151,26 +155,15 @@ export default class Snapshot implements Snapshot {
     }
     let record = this.record;
     let attributes = (this.__attributes = Object.create(null));
-    let attrs: string[];
-
-    if (CUSTOM_MODEL_CLASS) {
-      attrs = Object.keys(this._store._attributesDefinitionFor(this.modelName, this.identifier));
-    } else {
-      attrs = Object.keys(this._store._attributesDefinitionFor(this.modelName));
-    }
-    if (CUSTOM_MODEL_CLASS) {
-      attrs.forEach((keyName) => {
-        if (schemaIsDSModel(this.type)) {
-          // if the schema is for a DSModel then the instance is too
-          attributes[keyName] = get(record as DSModel, keyName);
-        } else {
-          attributes[keyName] = recordDataFor(this._internalModel).getAttr(keyName);
-        }
-      });
-    } else {
-      // When CUSTOM_MODEL_CLASS is false `record` must be DSModel
-      (record as DSModel).eachAttribute((keyName) => (attributes[keyName] = get(record as DSModel, keyName)));
-    }
+    let attrs = Object.keys(this._store._attributesDefinitionFor(this.identifier));
+    attrs.forEach((keyName) => {
+      if (schemaIsDSModel(this.type)) {
+        // if the schema is for a DSModel then the instance is too
+        attributes[keyName] = get(record as DSModel, keyName);
+      } else {
+        attributes[keyName] = recordDataFor(this._internalModel).getAttr(keyName);
+      }
+    });
 
     return attributes;
   }
@@ -187,9 +180,6 @@ export default class Snapshot implements Snapshot {
   }
 
   get isNew(): boolean {
-    if (!CUSTOM_MODEL_CLASS) {
-      throw new Error('isNew is only available when custom model class ff is on');
-    }
     return this._internalModel.isNew();
   }
 
@@ -333,7 +323,7 @@ export default class Snapshot implements Snapshot {
     }
 
     const graphFor = require('@ember-data/record-data/-private').graphFor;
-    const { identifier } = CUSTOM_MODEL_CLASS ? this : this._internalModel;
+    const { identifier } = this;
     const relationship = graphFor(this._store._storeWrapper).get(identifier, keyName);
 
     assert(
@@ -432,7 +422,7 @@ export default class Snapshot implements Snapshot {
     }
 
     const graphFor = require('@ember-data/record-data/-private').graphFor;
-    const { identifier } = CUSTOM_MODEL_CLASS ? this : this._internalModel;
+    const { identifier } = this;
     const relationship = graphFor(this._store._storeWrapper).get(identifier, keyName);
     assert(
       `You looked up the ${keyName} hasMany relationship for { type: ${identifier.type}, id: ${identifier.id}, lid: ${identifier.lid} but no such relationship was found.`,
@@ -488,15 +478,10 @@ export default class Snapshot implements Snapshot {
     @public
   */
   eachAttribute(callback: (key: string, meta: AttributeSchema) => void, binding?: unknown): void {
-    if (CUSTOM_MODEL_CLASS) {
-      let attrDefs = this._store._attributesDefinitionFor(this.modelName, this.identifier);
-      Object.keys(attrDefs).forEach((key) => {
-        callback.call(binding, key, attrDefs[key] as AttributeSchema);
-      });
-    } else {
-      // in the non CUSTOM_MODEL_CLASS world we only have DSModel instances
-      (this.record as DSModel).eachAttribute(callback, binding);
-    }
+    let attrDefs = this._store._attributesDefinitionFor(this.identifier);
+    Object.keys(attrDefs).forEach((key) => {
+      callback.call(binding, key, attrDefs[key] as AttributeSchema);
+    });
   }
 
   /**
@@ -517,15 +502,10 @@ export default class Snapshot implements Snapshot {
     @public
   */
   eachRelationship(callback: (key: string, meta: RelationshipSchema) => void, binding?: unknown): void {
-    if (CUSTOM_MODEL_CLASS) {
-      let relationshipDefs = this._store._relationshipsDefinitionFor(this.modelName, this.identifier);
-      Object.keys(relationshipDefs).forEach((key) => {
-        callback.call(binding, key, relationshipDefs[key] as RelationshipSchema);
-      });
-    } else {
-      // in the non CUSTOM_MODEL_CLASS world we only have DSModel instances
-      (this.record as DSModel).eachRelationship(callback, binding);
-    }
+    let relationshipDefs = this._store._relationshipsDefinitionFor(this.identifier);
+    Object.keys(relationshipDefs).forEach((key) => {
+      callback.call(binding, key, relationshipDefs[key] as RelationshipSchema);
+    });
   }
 
   /**

package/addon/-private/system/store/finders.js

@@ -1,11 +1,8 @@
-import { assert, deprecate, warn } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 import { Promise } from 'rsvp';
 
-import { REQUEST_SERVICE } from '@ember-data/canary-features';
-
-import coerceId from '../coerce-id';
 import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './common';
 import { normalizeResponseHelper } from './serializer-response';
 
@@ -21,88 +18,6 @@ function payloadIsNotBlank(adapterPayload) {
   }
 }
 
-export function _find(adapter, store, modelClass, id, internalModel, options) {
-  if (REQUEST_SERVICE) {
-    assert(`Requests made when REQUEST_SERVICE=true should not use the legacy finders`);
-  }
-  let snapshot = internalModel.createSnapshot(options);
-  let { modelName } = internalModel;
-  let promise = Promise.resolve().then(() => {
-    return adapter.findRecord(store, modelClass, id, snapshot);
-  });
-  let label = `DS: Handle Adapter#findRecord of '${modelName}' with id: '${id}'`;
-  const { identifier } = internalModel;
-
-  promise = guardDestroyedStore(promise, store, label);
-
-  return promise.then(
-    (adapterPayload) => {
-      assert(
-        `You made a 'findRecord' request for a '${modelName}' with id '${id}', but the adapter's response did not have any data`,
-        payloadIsNotBlank(adapterPayload)
-      );
-      let serializer = store.serializerFor(modelName);
-      let payload = normalizeResponseHelper(serializer, store, modelClass, adapterPayload, id, 'findRecord');
-      assert(
-        `Ember Data expected the primary data returned from a 'findRecord' response to be an object but instead it found an array.`,
-        !Array.isArray(payload.data)
-      );
-      assert(
-        `The 'findRecord' request for ${modelName}:${id} resolved indicating success but contained no primary data. To indicate a 404 not found you should either reject the promise returned by the adapter's findRecord method or throw a NotFoundError.`,
-        'data' in payload && payload.data !== null && typeof payload.data === 'object'
-      );
-      warn(
-        `You requested a record of type '${modelName}' with id '${id}' but the adapter returned a payload with primary data having an id of '${payload.data.id}'. Use 'store.findRecord()' when the requested id is the same as the one returned by the adapter. In other cases use 'store.queryRecord()' instead.`,
-        coerceId(payload.data.id) === coerceId(id),
-        {
-          id: 'ds.store.findRecord.id-mismatch',
-        }
-      );
-
-      // ensure that regardless of id returned we assign to the correct record
-      payload.data.lid = identifier.lid;
-
-      return store._push(payload);
-    },
-    (error) => {
-      internalModel.send('notFound');
-      if (internalModel.currentState.isEmpty) {
-        internalModel.unloadRecord();
-      }
-
-      throw error;
-    },
-    `DS: Extract payload of '${modelName}'`
-  );
-}
-
-export function _findMany(adapter, store, modelName, ids, internalModels, optionsMap) {
-  let snapshots = internalModels.map((internalModel) => internalModel.createSnapshot(optionsMap.get(internalModel)));
-  let modelClass = store.modelFor(modelName); // `adapter.findMany` gets the modelClass still
-  let promise = adapter.findMany(store, modelClass, ids, snapshots);
-  let label = `DS: Handle Adapter#findMany of '${modelName}'`;
-
-  if (promise === undefined) {
-    throw new Error('adapter.findMany returned undefined, this was very likely a mistake');
-  }
-
-  promise = guardDestroyedStore(promise, store, label);
-
-  return promise.then(
-    (adapterPayload) => {
-      assert(
-        `You made a 'findMany' request for '${modelName}' records with ids '[${ids}]', but the adapter's response did not have any data`,
-        payloadIsNotBlank(adapterPayload)
-      );
-      let serializer = store.serializerFor(modelName);
-      let payload = normalizeResponseHelper(serializer, store, modelClass, adapterPayload, null, 'findMany');
-      return store._push(payload);
-    },
-    null,
-    `DS: Extract payload of ${modelName}`
-  );
-}
-
 function iterateData(data, fn) {
   if (Array.isArray(data)) {
     return data.map(fn);
@@ -201,16 +116,7 @@ function ensureRelationshipIsSetToParent(payload, parentInternalModel, store, pa
         `Please update the response from the server or change your serializer to either ensure that the response for only includes ${quotedType} records that specify ${expectedModel} as their ${quotedInverse}, or omit the ${quotedInverse} relationship from the response.`,
       ].join('\n');
 
-      // this should eventually throw instead of deprecating.
-      deprecate(message + '\n', false, {
-        id: 'mismatched-inverse-relationship-data-from-payload',
-        until: '3.8',
-        for: '@ember-data/store',
-        since: {
-          available: '3.8',
-          enabled: '3.8',
-        },
-      });
+      assert(message);
     }
 
     if (kind !== 'hasMany' || typeof relationshipData !== 'undefined') {

package/addon/-private/system/store/internal-model-factory.ts

@@ -3,7 +3,6 @@ import { isNone } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
 import type { IdentifierCache } from '../../identifiers/cache';
-import { identifierCacheFor } from '../../identifiers/cache';
 import type {
   ExistingResourceObject,
   NewResourceIdentifierObject,
@@ -16,39 +15,53 @@ import type CoreStore from '../core-store';
 import IdentityMap from '../identity-map';
 import type InternalModelMap from '../internal-model-map';
 import InternalModel from '../model/internal-model';
+import WeakCache from '../weak-cache';
 
 /**
   @module @ember-data/store
 */
 
-const FactoryCache = new WeakMap<CoreStore, InternalModelFactory>();
+const FactoryCache = new WeakCache<CoreStore, InternalModelFactory>(DEBUG ? 'internal-model-factory' : '');
+FactoryCache._generator = (store: CoreStore) => {
+  return new InternalModelFactory(store);
+};
 type NewResourceInfo = { type: string; id: string | null };
 
-const RecordCache = new WeakMap<RecordInstance, StableRecordIdentifier>();
+const RecordCache = new WeakCache<RecordInstance, StableRecordIdentifier>(DEBUG ? 'identifier' : '');
+if (DEBUG) {
+  RecordCache._expectMsg = (key: RecordInstance) => `${key} is not a record instantiated by @ember-data/store`;
+}
 
 export function peekRecordIdentifier(record: any): StableRecordIdentifier | undefined {
   return RecordCache.get(record);
 }
 
 /**
- * Retrieves the unique referentially-stable RecordIdentifier assigned to the given
- * record instance.
- *
- * @method recordIdentifierFor
- * @public
- * @static
- * @for @ember-data/store
- * @param {Object} record a record instance previously obstained from the store.
- * @returns
- */
-export function recordIdentifierFor(record: RecordInstance): StableRecordIdentifier {
-  let identifier = RecordCache.get(record);
+  Retrieves the unique referentially-stable [RecordIdentifier](/ember-data/release/classes/StableRecordIdentifier)
+  assigned to the given record instance.
 
-  if (DEBUG && identifier === undefined) {
-    throw new Error(`${record} is not a record instantiated by @ember-data/store`);
-  }
+  ```js
+  import { recordIdentifierFor } from "@ember-data/store";
+
+  // ... gain access to a record, for instance with peekRecord or findRecord
+  const record = store.peekRecord("user", "1");
+
+  // get the identifier for the record (see docs for StableRecordIdentifier)
+  const identifier = recordIdentifierFor(record);
 
-  return identifier as StableRecordIdentifier;
+  // access the identifier's properties.
+  const { id, type, lid } = identifier;
+  ```
+
+  @method recordIdentifierFor
+  @public
+  @static
+  @for @ember-data/store
+  @param {Object} record a record instance previously obstained from the store.
+  @returns {StableRecordIdentifier}
+ */
+export function recordIdentifierFor(record: RecordInstance): StableRecordIdentifier {
+  return RecordCache.getWithError(record);
 }
 
 export function setRecordIdentifier(record: RecordInstance, identifier: StableRecordIdentifier): void {
@@ -68,14 +81,7 @@ export function setRecordIdentifier(record: RecordInstance, identifier: StableRe
 }
 
 export function internalModelFactoryFor(store: CoreStore): InternalModelFactory {
-  let factory = FactoryCache.get(store);
-
-  if (factory === undefined) {
-    factory = new InternalModelFactory(store);
-    FactoryCache.set(store, factory);
-  }
-
-  return factory;
+  return FactoryCache.lookup(store);
 }
 
 /**
@@ -93,7 +99,7 @@ export default class InternalModelFactory {
 
   constructor(store: CoreStore) {
     this.store = store;
-    this.identifierCache = identifierCacheFor(store);
+    this.identifierCache = store.identifierCache;
     this.identifierCache.__configureMerge((identifier, matchedIdentifier, resourceData) => {
       let intendedIdentifier = identifier;
       if (identifier.id !== matchedIdentifier.id) {