@itwin/core-backend 5.0.0-dev.99 → 5.0.0

package/lib/esm/IModelDb.js

@@ -8,8 +8,8 @@
 import * as fs from "fs";
 import { join } from "path";
 import * as touch from "touch";
-import { assert, BeEvent, BentleyStatus, ChangeSetStatus, DbChangeStage, DbConflictCause, DbConflictResolution, DbResult, Guid, Id64, IModelStatus, JsonUtils, Logger, LogLevel, OpenMode, } from "@itwin/core-bentley";
-import { BriefcaseIdValue, Code, DomainOptions, ECJsNames, ECSqlReader, EntityMetaData, FontMap, IModel, IModelError, IModelNotFoundResponse, ProfileOptions, QueryRowFormat, SchemaState, ViewStoreRpc, } from "@itwin/core-common";
+import { assert, BeEvent, BentleyStatus, ChangeSetStatus, DbChangeStage, DbConflictCause, DbConflictResolution, DbResult, Guid, Id64, IModelStatus, JsonUtils, Logger, LogLevel, LRUMap, OpenMode } from "@itwin/core-bentley";
+import { BriefcaseIdValue, Code, DomainOptions, ECJsNames, ECSqlReader, EntityMetaData, FontMap, IModel, IModelError, IModelNotFoundResponse, ProfileOptions, QueryRowFormat, SchemaState, ViewStoreRpc } from "@itwin/core-common";
 import { Range2d, Range3d } from "@itwin/core-geometry";
 import { BackendLoggerCategory } from "./BackendLoggerCategory";
 import { BriefcaseManager } from "./BriefcaseManager";
@@ -44,9 +44,10 @@ import { SettingsImpl } from "./internal/workspace/SettingsImpl";
 import { IModelNative } from "./internal/NativePlatform";
 import { createNoOpLockControl } from "./internal/NoLocks";
 import { createIModelDbFonts } from "./internal/IModelDbFontsImpl";
-import { _close, _hubAccess, _nativeDb, _releaseAllLocks } from "./internal/Symbols";
+import { _cache, _close, _hubAccess, _nativeDb, _releaseAllLocks } from "./internal/Symbols";
 import { SchemaContext, SchemaJsonLocater } from "@itwin/ecschema-metadata";
 import { SchemaMap } from "./Schema";
+import { ElementLRUCache } from "./internal/ElementLRUCache";
 // spell:ignore fontid fontmap
 const loggerCategory = BackendLoggerCategory.IModelDb;
 /** @internal */
@@ -106,7 +107,7 @@ export class IModelDb extends IModel {
     _jsClassMap;
     _schemaMap;
     _schemaContext;
-    /** @deprecated in 5.0.0. Use [[fonts]]. */
+    /** @deprecated in 5.0.0 - will not be removed until after 2026-06-13. Use [[fonts]]. */
     _fontMap; // eslint-disable-line @typescript-eslint/no-deprecated
     _fonts = createIModelDbFonts(this);
     _workspace;
@@ -133,6 +134,13 @@ export class IModelDb extends IModel {
             this._workspace = constructWorkspace(new IModelSettings());
         return this._workspace;
     }
+    /**
+     * get the cloud container for this iModel, if it was opened from one
+     * @beta
+     */
+    get cloudContainer() {
+        return this[_nativeDb].cloudContainer;
+    }
     /** Acquire the exclusive schema lock on this iModel.
      * @note: To acquire the schema lock, all other briefcases must first release *all* their locks. No other briefcases
      * will be able to acquire *any* locks while the schema lock is held.
@@ -155,7 +163,7 @@ export class IModelDb extends IModel {
     restartDefaultTxn() {
         this[_nativeDb].restartDefaultTxn();
     }
-    /** @deprecated in 5.0.0. Use [[fonts]]. */
+    /** @deprecated in 5.0.0 - will not be removed until after 2026-06-13. Use [[fonts]]. */
     get fontMap() {
         return this._fontMap ?? (this._fontMap = new FontMap(this[_nativeDb].readFontMap())); // eslint-disable-line @typescript-eslint/no-deprecated
     }
@@ -332,7 +340,7 @@ export class IModelDb extends IModel {
      * @returns the value returned by `callback`.
      * @see [[withStatement]]
      * @public
-     * @deprecated in 4.11.  Use [[createQueryReader]] instead.
+     * @deprecated in 4.11 - will not be removed until after 2026-06-13.  Use [[createQueryReader]] instead.
      */
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     withPreparedStatement(ecsql, callback, logErrors = true) {
@@ -364,7 +372,7 @@ export class IModelDb extends IModel {
      * @returns the value returned by `callback`.
      * @see [[withPreparedStatement]]
      * @public
-     * @deprecated in 4.11.  Use [[createQueryReader]] instead.
+     * @deprecated in 4.11 - will not be removed until after 2026-06-13.  Use [[createQueryReader]] instead.
      */
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     withStatement(ecsql, callback, logErrors = true) {
@@ -569,6 +577,8 @@ export class IModelDb extends IModel {
         this._jsClassMap = undefined;
         this._schemaMap = undefined;
         this._schemaContext = undefined;
+        this.elements[_cache].clear();
+        this.models[_cache].clear();
     }
     /** Update the project extents for this iModel.
      * <p><em>Example:</em>
@@ -624,6 +634,7 @@ export class IModelDb extends IModel {
      * @note This will not delete Txns that have already been saved, even if they have not yet been pushed.
     */
     abandonChanges() {
+        this.clearCaches();
         this[_nativeDb].abandonChanges();
     }
     /**
@@ -637,11 +648,14 @@ export class IModelDb extends IModel {
     performCheckpoint() {
         if (!this.isReadonly) {
             this.saveChanges();
+            this.clearCaches();
+            this[_nativeDb].concurrentQueryShutdown();
+            this[_nativeDb].clearECDbCache();
             this[_nativeDb].performCheckpoint();
         }
     }
     /** @internal
-     * @deprecated in 4.8. Use `txns.reverseTxns`.
+     * @deprecated in 4.8 - will not be removed until after 2026-06-13. Use `txns.reverseTxns`.
      */
     reverseTxns(numOperations) {
         return this[_nativeDb].reverseTxns(numOperations);
@@ -867,7 +881,7 @@ export class IModelDb extends IModel {
     }
     /** The registry of entity metadata for this iModel.
      * @internal
-     * @deprecated in 5.0. Please use `schemaContext` from the `iModel` instead.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Please use `schemaContext` from the `iModel` instead.
      *
      * @example
      * ```typescript
@@ -903,7 +917,7 @@ export class IModelDb extends IModel {
     }
     /**
      * Gets the context that allows accessing the metadata (ecschema-metadata package) of this iModel
-     * @beta
+     * @public @preview
      */
     get schemaContext() {
         if (this._schemaContext === undefined) {
@@ -927,7 +941,7 @@ export class IModelDb extends IModel {
      * @param sql The ECSQL statement to prepare
      * @param logErrors Determines if error will be logged if statement fail to prepare
      * @throws [[IModelError]] if there is a problem preparing the statement.
-     * @deprecated in 4.11.  Use [IModelDb.createQueryReader]($backend) or [ECDb.createQueryReader]($backend) to query.
+     * @deprecated in 4.11 - will not be removed until after 2026-06-13.  Use [IModelDb.createQueryReader]($backend) or [ECDb.createQueryReader]($backend) to query.
      */
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     prepareStatement(sql, logErrors = true) {
@@ -939,7 +953,7 @@ export class IModelDb extends IModel {
     /** Prepare an ECSQL statement.
      * @param sql The ECSQL statement to prepare
      * @returns `undefined` if there is a problem preparing the statement.
-     * @deprecated in 4.11.  Use [IModelDb.createQueryReader]($backend) or [ECDb.createQueryReader]($backend) to query.
+     * @deprecated in 4.11 - will not be removed until after 2026-06-13.  Use [IModelDb.createQueryReader]($backend) or [ECDb.createQueryReader]($backend) to query.
      */
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     tryPrepareStatement(sql) {
@@ -969,9 +983,27 @@ export class IModelDb extends IModel {
             return ClassRegistry.getClass(classFullName, this);
         }
     }
+    /** Constructs a ResolveInstanceKeyArgs from given parameters
+     * @throws [[IModelError]] if the combination of supplied parameters is invalid.
+     * @internal
+     */
+    getInstanceArgs(instanceId, baseClassName, federationGuid, code) {
+        if (instanceId && baseClassName) {
+            return { partialKey: { id: instanceId, baseClassName } };
+        }
+        else if (federationGuid) {
+            return { federationGuid };
+        }
+        else if (code) {
+            return { code };
+        }
+        else {
+            throw new IModelError(IModelStatus.InvalidId, "Either instanceId and baseClassName or federationGuid or code must be specified");
+        }
+    }
     /** Get metadata for a class. This method will load the metadata from the iModel into the cache as a side-effect, if necessary.
      * @throws [[IModelError]] if the metadata cannot be found nor loaded.
-     * @deprecated in 5.0. Please use `getSchemaItem` from `SchemaContext` class instead.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Please use `getSchemaItem` from `SchemaContext` class instead.
      *
      * @example
      *  * ```typescript
@@ -997,7 +1029,7 @@ export class IModelDb extends IModel {
         return metadata;
     }
     /** Identical to [[getMetaData]], except it returns `undefined` instead of throwing an error if the metadata cannot be found nor loaded.
-     * @deprecated in 5.0. Please use `getSchemaItem` from `SchemaContext` class instead.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Please use `getSchemaItem` from `SchemaContext` class instead.
      *
      * @example
      *  * ```typescript
@@ -1025,7 +1057,7 @@ export class IModelDb extends IModel {
      * @param func The callback to be invoked on each property
      * @param includeCustom If true (default), include custom-handled properties in the iteration. Otherwise, skip custom-handled properties.
      * @note Custom-handled properties are core properties that have behavior enforced by C++ handlers.
-     * @deprecated in 5.0. Please use `forEachProperty` instead.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Please use `forEachProperty` instead.
      *
      * @example
      * ```typescript
@@ -1051,7 +1083,7 @@ export class IModelDb extends IModel {
      * @param func The callback to be invoked on each property
      * @param includeCustom If true (default), include custom-handled properties in the iteration. Otherwise, skip custom-handled properties.
      * @note Custom-handled properties are core properties that have behavior enforced by C++ handlers.
-     * @deprecated in 5.0. Use `forEachProperty` from `SchemaContext` class instead.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Use `forEachProperty` from `SchemaContext` class instead.
      *
      * @example
      * ```typescript
@@ -1081,7 +1113,7 @@ export class IModelDb extends IModel {
     }
     /**
      * @internal
-     * @deprecated in 5.0. Please use `schemaContext` from `iModel` instead to get metadata.
+     * @deprecated in 5.0 - will not be removed until after 2026-06-13. Please use `schemaContext` from `iModel` instead to get metadata.
      */
     loadMetaData(classFullName) {
         // eslint-disable-next-line @typescript-eslint/no-deprecated
@@ -1446,11 +1478,13 @@ function processSchemaWriteStatus(status) {
 /** @public */
 (function (IModelDb) {
     /** The collection of models in an [[IModelDb]].
-     * @public
+     * @public @preview
      */
     class Models {
         _iModel;
         /** @internal */
+        [_cache] = new LRUMap(500);
+        /** @internal */
         constructor(_iModel) {
             this._iModel = _iModel;
         }
@@ -1460,7 +1494,10 @@ function processSchemaWriteStatus(status) {
          * @see tryGetModelProps
          */
         getModelProps(id) {
-            return this.getModelJson({ id });
+            const model = this.tryGetModelProps(id);
+            if (undefined === model)
+                throw new IModelError(IModelStatus.NotFound, `Model=${id}`);
+            return model;
         }
         /** Get the ModelProps with the specified identifier.
          * @param modelId The Model identifier.
@@ -1470,7 +1507,25 @@ function processSchemaWriteStatus(status) {
          * @see getModelProps
          */
         tryGetModelProps(id) {
-            return this.tryGetModelJson({ id });
+            try {
+                if (IModelHost.configuration?.disableThinnedNativeInstanceWorkflow) {
+                    return this._iModel[_nativeDb].getModel({ id });
+                }
+                const cachedMdl = this[_cache].get(id);
+                if (cachedMdl) {
+                    return cachedMdl;
+                }
+                const options = { useJsNames: true };
+                const instanceKey = this.resolveModelKey({ id });
+                const rawInstance = this._iModel[_nativeDb].readInstance(instanceKey, options);
+                const classDef = this._iModel.getJsClass(rawInstance.classFullName);
+                const modelProps = classDef.deserialize({ row: rawInstance, iModel: this._iModel });
+                this[_cache].set(id, modelProps);
+                return modelProps;
+            }
+            catch {
+                return undefined;
+            }
         }
         /** Query for the last modified time for a [[Model]].
          * @param modelId The Id of the model.
@@ -1517,32 +1572,22 @@ function processSchemaWriteStatus(status) {
                 return model; // modelClass was not specified, cannot call instanceof to validate
             return model instanceof modelClass ? model : undefined;
         }
-        /** Read the properties for a Model as a json string.
-         * @param modelIdArg a json string with the identity of the model to load. Must have either "id" or "code".
-         * @returns a json string with the properties of the model.
-         * @throws [[IModelError]] if the model is not found or cannot be loaded.
-         * @see tryGetModelJson
-         * @internal
-         */
-        getModelJson(modelIdArg) {
-            const modelJson = this.tryGetModelJson(modelIdArg);
-            if (undefined === modelJson) {
-                throw new IModelError(IModelStatus.NotFound, `Model=(id: ${modelIdArg.id}, code: ${modelIdArg.code})`);
+        resolveModelKey(modelIdArg) {
+            const baseClassName = "BisCore:Model";
+            let args;
+            if (modelIdArg.id) {
+                args = { partialKey: { id: modelIdArg.id, baseClassName } };
             }
-            return modelJson;
-        }
-        /** Read the properties for a Model as a json string.
-         * @param modelIdArg a json string with the identity of the model to load. Must have either "id" or "code".
-         * @returns a json string with the properties of the model or `undefined` if the model is not found.
-         * @see getModelJson
-         */
-        tryGetModelJson(modelIdArg) {
-            try {
-                return this._iModel[_nativeDb].getModel(modelIdArg);
+            else if (modelIdArg.code) {
+                const modelId = this._iModel.elements.getElementProps({ code: modelIdArg.code }).id;
+                if (!modelId)
+                    throw new IModelError(IModelStatus.NotFound, `Model not found with code: [spec:${modelIdArg.code.spec}, scope:${modelIdArg.code.scope}, value:${modelIdArg.code.value}])`);
+                args = { partialKey: { id: modelId, baseClassName } };
             }
-            catch {
-                return undefined;
+            else {
+                throw new IModelError(IModelStatus.InvalidId, `Invalid model identifier: ${JSON.stringify(modelIdArg)}`);
             }
+            return this._iModel[_nativeDb].resolveInstanceKey(args);
         }
         /** Get the sub-model of the specified Element.
          * See [[IModelDb.Elements.queryElementIdByCode]] for more on how to find an element by Code.
@@ -1595,6 +1640,8 @@ function processSchemaWriteStatus(status) {
          */
         updateModel(props) {
             try {
+                if (props.id)
+                    this[_cache].delete(props.id);
                 this._iModel[_nativeDb].updateModel(props);
             }
             catch (err) {
@@ -1611,6 +1658,7 @@ function processSchemaWriteStatus(status) {
          * @see [[TxnManager.onModelGeometryChanged]] for the event emitted in response to such a change.
          */
         updateGeometryGuid(modelId) {
+            this._iModel.models[_cache].delete(modelId);
             const error = this._iModel[_nativeDb].updateModelGeometryGuid(modelId);
             if (error !== IModelStatus.Success)
                 throw new IModelError(error, `updating geometry guid for model ${modelId}`);
@@ -1622,6 +1670,7 @@ function processSchemaWriteStatus(status) {
         deleteModel(ids) {
             Id64.toIdSet(ids).forEach((id) => {
                 try {
+                    this[_cache].delete(id);
                     this._iModel[_nativeDb].deleteModel(id);
                 }
                 catch (err) {
@@ -1655,11 +1704,13 @@ function processSchemaWriteStatus(status) {
     }
     IModelDb.Models = Models;
     /** The collection of elements in an [[IModelDb]].
-     * @public
+     * @public @preview
      */
     class Elements {
         _iModel;
         /** @internal */
+        [_cache] = new ElementLRUCache();
+        /** @internal */
         constructor(_iModel) {
             this._iModel = _iModel;
         }
@@ -1675,50 +1726,40 @@ function processSchemaWriteStatus(status) {
                 return !stmt.nextRow() ? undefined : stmt.getValueId(0);
             }) : undefined;
         }
-        /** Read element data from the iModel as JSON
-         * @param elementIdArg a json string with the identity of the element to load. Must have one of "id", "federationGuid", or "code".
-         * @returns The JSON properties of the element.
-         * @throws [[IModelError]] if the element is not found or cannot be loaded.
-         * @see tryGetElementJson
-         * @internal
-         */
-        getElementJson(elementId) {
-            const elementProps = this.tryGetElementJson(elementId);
-            if (undefined === elementProps)
-                throw new IModelError(IModelStatus.NotFound, `reading element={id: ${elementId.id} federationGuid: ${elementId.federationGuid}, code: ${elementId.code}}`);
-            return elementProps;
-        }
-        /** Read element data from the iModel as JSON
-         * @param loadProps - a json string with the identity of the element to load. Must have one of "id", "federationGuid", or "code".
-         * @returns The JSON properties of the element or `undefined` if the element is not found.
-         * @throws [[IModelError]] if the element exists, but cannot be loaded.
-         * @see getElementJson
-         */
-        tryGetElementJson(loadProps) {
-            try {
-                return this._iModel[_nativeDb].getElement(loadProps);
-            }
-            catch {
-                return undefined;
-            }
-        }
         /** Get properties of an Element by Id, FederationGuid, or Code
          * @throws [[IModelError]] if the element is not found or cannot be loaded.
          * @see tryGetElementProps
          */
         getElementProps(props) {
+            const elProp = this.tryGetElementProps(props);
+            if (undefined === elProp)
+                throw new IModelError(IModelStatus.NotFound, `element not found`);
+            return elProp;
+        }
+        resolveElementKey(props) {
+            const baseClassName = "BisCore:Element";
+            let args;
             if (typeof props === "string") {
-                props = Id64.isId64(props) ? { id: props } : { federationGuid: props };
+                args = Id64.isId64(props) ? { partialKey: { id: props, baseClassName } } : { federationGuid: props };
             }
             else if (props instanceof Code) {
-                props = { code: props };
+                args = { code: props };
             }
-            try {
-                return this._iModel[_nativeDb].getElement(props);
-            }
-            catch (err) {
-                throw new IModelError(err.errorNumber, err.message);
+            else {
+                if (props.id) {
+                    args = { partialKey: { id: props.id, baseClassName } };
+                }
+                else if (props.federationGuid) {
+                    args = { federationGuid: props.federationGuid };
+                }
+                else if (props.code) {
+                    args = { code: props.code };
+                }
+                else {
+                    throw new IModelError(IModelStatus.InvalidId, "Element Id or FederationGuid or Code is required");
+                }
             }
+            return this._iModel[_nativeDb].resolveInstanceKey(args);
         }
         /** Get properties of an Element by Id, FederationGuid, or Code
          * @returns The properties of the element or `undefined` if the element is not found.
@@ -1726,14 +1767,32 @@ function processSchemaWriteStatus(status) {
          * @note Useful for cases when an element may or may not exist and throwing an `Error` would be overkill.
          * @see getElementProps
          */
-        tryGetElementProps(elementId) {
-            if (typeof elementId === "string") {
-                elementId = Id64.isId64(elementId) ? { id: elementId } : { federationGuid: elementId };
+        tryGetElementProps(props) {
+            if (typeof props === "string") {
+                props = Id64.isId64(props) ? { id: props } : { federationGuid: props };
             }
-            else if (elementId instanceof Code) {
-                elementId = { code: elementId };
+            else if (props instanceof Code) {
+                props = { code: props };
+            }
+            try {
+                if (IModelHost.configuration?.disableThinnedNativeInstanceWorkflow) {
+                    return this._iModel[_nativeDb].getElement(props);
+                }
+                const cachedElm = this[_cache].get(props);
+                if (cachedElm) {
+                    return cachedElm.elProps;
+                }
+                const options = { ...props, useJsNames: true };
+                const instanceKey = this.resolveElementKey(props);
+                const rawInstance = this._iModel[_nativeDb].readInstance(instanceKey, options);
+                const classDef = this._iModel.getJsClass(rawInstance.classFullName);
+                const elementProps = classDef.deserialize({ row: rawInstance, iModel: this._iModel, options: { element: props } });
+                this[_cache].set({ elProps: elementProps, loadOptions: props });
+                return elementProps;
+            }
+            catch {
+                return undefined;
             }
-            return this.tryGetElementJson(elementId);
         }
         /** Get an element by Id, FederationGuid, or Code
          * @param elementId either the element's Id, Code, or FederationGuid, or an ElementLoadProps
@@ -1766,7 +1825,7 @@ function processSchemaWriteStatus(status) {
                 elementId = { code: elementId };
             else
                 elementId.onlyBaseProperties = false; // we must load all properties to construct the element.
-            const elementProps = this.tryGetElementJson(elementId);
+            const elementProps = this.tryGetElementProps(elementId);
             if (undefined === elementProps)
                 return undefined; // no Element with that elementId found
             const element = this._iModel.constructEntity(elementProps);
@@ -1830,6 +1889,11 @@ function processSchemaWriteStatus(status) {
          */
         insertElement(elProps, options) {
             try {
+                this[_cache].delete({
+                    id: elProps.id,
+                    federationGuid: elProps.federationGuid,
+                    code: elProps.code,
+                });
                 return elProps.id = this._iModel[_nativeDb].insertElement(elProps, options);
             }
             catch (err) {
@@ -1851,6 +1915,11 @@ function processSchemaWriteStatus(status) {
          */
         updateElement(elProps) {
             try {
+                this[_cache].delete({
+                    id: elProps.id,
+                    federationGuid: elProps.federationGuid,
+                    code: elProps.code,
+                });
                 this._iModel[_nativeDb].updateElement(elProps);
             }
             catch (err) {
@@ -1868,6 +1937,7 @@ function processSchemaWriteStatus(status) {
             const iModel = this._iModel;
             Id64.toIdSet(ids).forEach((id) => {
                 try {
+                    this[_cache].delete({ id });
                     iModel[_nativeDb].deleteElement(id);
                 }
                 catch (err) {
@@ -2180,7 +2250,7 @@ function processSchemaWriteStatus(status) {
     }
     IModelDb.Elements = Elements;
     /** The collection of views in an [[IModelDb]].
-     * @public
+     * @public @preview
      */
     class Views {
         _iModel;
@@ -2356,7 +2426,7 @@ function processSchemaWriteStatus(status) {
         }
         /** Set the default view property the iModel.
          * @param viewId The Id of the ViewDefinition to use as the default
-         * @deprecated in 4.2.x. Avoid setting this property - it is not practical for one single view to serve the needs of the many applications
+         * @deprecated in 4.2.x - will not be removed until after 2026-06-13. Avoid setting this property - it is not practical for one single view to serve the needs of the many applications
          * that might wish to view the contents of the iModel.
          */
         setDefaultViewId(viewId) {
@@ -2370,9 +2440,9 @@ function processSchemaWriteStatus(status) {
     }
     IModelDb.Views = Views;
     /** Represents the current state of a pollable tile content request.
-   * Note: lack of a "completed" state because polling a completed request returns the content as a Uint8Array.
-   * @internal
-   */
+    * Note: lack of a "completed" state because polling a completed request returns the content as a Uint8Array.
+    * @internal
+    */
     let TileContentState;
     (function (TileContentState) {
         TileContentState[TileContentState["New"] = 0] = "New";
@@ -2612,7 +2682,7 @@ export class BriefcaseDb extends IModelDb {
         const file = { path: args.fileName, key: args.key };
         const openMode = (args.readonly || args.watchForChanges) ? OpenMode.Readonly : OpenMode.ReadWrite;
         const nativeDb = this.openDgnDb(file, openMode, undefined, args);
-        const briefcaseDb = new BriefcaseDb({ nativeDb, key: file.key ?? Guid.createValue(), openMode, briefcaseId: nativeDb.getBriefcaseId() });
+        const briefcaseDb = new this({ nativeDb, key: file.key ?? Guid.createValue(), openMode, briefcaseId: nativeDb.getBriefcaseId() });
         // If they asked to watch for changes, set an fs.watch on the "-watch" file (only it is modified while we hold this connection.)
         // Whenever there are changes, restart our defaultTxn. That loads the changes from the other connection and sends
         // notifications as if they happened on this connection. Note: the watcher is called only when the backend event loop cycles.
@@ -2621,6 +2691,7 @@ export class BriefcaseDb extends IModelDb {
             touch.sync(briefcaseDb.watchFilePathName);
             // Restart default txn to trigger events when watch file is changed by some other process.
             const watcher = fs.watch(briefcaseDb.watchFilePathName, { persistent: false }, () => {
+                nativeDb.clearECDbCache();
                 nativeDb.restartDefaultTxn();
                 briefcaseDb.changeset = briefcaseDb[_nativeDb].getCurrentChangeset();
             });
@@ -2960,7 +3031,7 @@ class RefreshV2CheckpointSas {
         Logger.logInfo(BackendLoggerCategory.Authorization, "attempting to refresh sasToken for checkpoint");
         try {
             // this exchanges the supplied user accessToken for an expiring blob-store token to read the checkpoint.
-            const container = iModel[_nativeDb].cloudContainer;
+            const container = iModel.cloudContainer;
             if (!container)
                 throw new Error("checkpoint is not from a cloud container");
             assert(undefined !== iModel.iTwinId);
@@ -3086,7 +3157,7 @@ export class SnapshotDb extends IModelDb {
             file.key = `${nativeDb.getIModelId()}:${nativeDb.getCurrentChangeset().id}`;
         }
         assert(undefined !== file.key);
-        const db = new SnapshotDb(nativeDb, file.key);
+        const db = new this(nativeDb, file.key);
         this.onOpened.raiseEvent(db);
         return db;
     }
@@ -3112,7 +3183,7 @@ export class SnapshotDb extends IModelDb {
         snapshot._restartDefaultTxnTimer = setTimeout(() => {
             snapshot.restartDefaultTxn();
         }, (10 * 60) * 1000).unref(); // 10 minutes
-        const cloudContainer = snapshot[_nativeDb].cloudContainer;
+        const cloudContainer = snapshot.cloudContainer;
         if (cloudContainer !== undefined) {
             snapshot._refreshSas = new RefreshV2CheckpointSas(cloudContainer.accessToken, checkpoint.reattachSafetySeconds);
         }
@@ -3186,7 +3257,7 @@ export class StandaloneDb extends BriefcaseDb {
         nativeDb.setITwinId(Guid.empty);
         nativeDb.resetBriefcaseId(BriefcaseIdValue.Unassigned);
         nativeDb.saveChanges();
-        const db = new StandaloneDb({ nativeDb, key: Guid.createValue(), briefcaseId: BriefcaseIdValue.Unassigned, openMode: OpenMode.ReadWrite });
+        const db = new this({ nativeDb, key: Guid.createValue(), briefcaseId: BriefcaseIdValue.Unassigned, openMode: OpenMode.ReadWrite });
         db.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         return db;
     }
@@ -3232,7 +3303,7 @@ export class StandaloneDb extends BriefcaseDb {
             if (iTwinId !== Guid.empty) // a "standalone" iModel means it is not associated with an iTwin
                 throw new IModelError(IModelStatus.WrongIModel, `${filePath} is not a Standalone iModel. iTwinId=${iTwinId}`);
             assert(undefined !== file.key);
-            const db = new StandaloneDb({ nativeDb, key: file.key, openMode, briefcaseId: BriefcaseIdValue.Unassigned });
+            const db = new this({ nativeDb, key: file.key, openMode, briefcaseId: BriefcaseIdValue.Unassigned });
             return db;
         }
         catch (error) {