@openui5/sap.ui.core 1.115.1 → 1.117.0

package/test/sap/ui/core/qunit/odata/v4/ODataParentBinding.qunit.js

@@ -62,6 +62,7 @@ sap.ui.define([
 
 		assert.deepEqual(oBinding.mAggregatedQueryOptions, {});
 		assert.strictEqual(oBinding.bAggregatedQueryOptionsInitial, true);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {});
 		assert.deepEqual(oBinding.aChildCanUseCachePromises, []);
 		assert.strictEqual(oBinding.bHasPathReductionToParent, false);
 		assert.strictEqual(oBinding.iPatchCounter, 0);
@@ -694,19 +695,31 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("aggregateQueryOptions: do not embed child query options", function (assert) {
+	QUnit.test("aggregateQueryOptions: merge mLateQueryOptions, do not embed", function (assert) {
 		var oBinding = new ODataParentBinding({
-				mAggregatedQueryOptions : {}
+				mAggregatedQueryOptions : {$search : "covfefe"},
+				mLateQueryOptions : {$select : ["late"]}
 			}),
-			mChildQueryOptions = {$select : ["bar"], $count : true, $filter : "baz eq 42"};
+			mChildQueryOptions = {
+				$count : true,
+				$filter : "baz eq 42",
+				$select : ["bar"]
+			};
 
 		// code under test
-		assert.ok(oBinding.aggregateQueryOptions({$expand : {foo : mChildQueryOptions}}, false));
+		assert.ok(oBinding.aggregateQueryOptions({$expand : {foo : mChildQueryOptions}}));
 
-		assert.deepEqual(oBinding.mAggregatedQueryOptions, {$expand : {foo : mChildQueryOptions}});
+		assert.deepEqual(oBinding.mAggregatedQueryOptions, {
+			$expand : {foo : mChildQueryOptions},
+			$search : "covfefe"
+		});
+		assert.deepEqual(oBinding.mLateQueryOptions, {
+			$expand : {foo : mChildQueryOptions},
+			$select : ["late"]
+		});
 		assert.notStrictEqual(oBinding.mAggregatedQueryOptions.$expand.foo, mChildQueryOptions);
 		assert.notStrictEqual(oBinding.mAggregatedQueryOptions.$expand.foo.$select,
-			mChildQueryOptions.$select);
+			mChildQueryOptions.$select, "do not embed child query options");
 	});
 
 	//*********************************************************************************************
@@ -833,8 +846,6 @@ sap.ui.define([
 				function (assert) {
 					var mAggregatedQueryOptions = {},
 						oMetaModel = {
-							fetchObject : function () {},
-							getMetaPath : function () {},
 							getReducedPath : function () {}
 						},
 						fnFetchMetadata = function () {},
@@ -846,7 +857,7 @@ sap.ui.define([
 								? SyncPromise.resolve(Promise.resolve(null))
 								: SyncPromise.resolve(null),
 							oContext : {},
-							doFetchQueryOptions : function () {},
+							doFetchOrGetQueryOptions : function () {},
 							oModel : {
 								getMetaModel : function () { return oMetaModel; },
 								oInterface : {
@@ -858,13 +869,11 @@ sap.ui.define([
 							sPath : "path"
 						}),
 						oBindingMock = this.mock(oBinding),
-						mChildLocalQueryOptions = {},
 						mChildQueryOptions = oFixture.hasChildQueryOptions ? {} : undefined,
+						mClonedQueryOptions = {},
 						oContext = Context.create(this.oModel, oBinding, "/Set('2')"),
-						mExtendResult = {},
 						oHelperMock = this.mock(_Helper),
 						mLocalQueryOptions = {},
-						oMetaModelMock = this.mock(oMetaModel),
 						oModelMock = this.mock(oBinding.oModel),
 						oPromise;
 
@@ -874,21 +883,21 @@ sap.ui.define([
 					oHelperMock.expects("getMetaPath").withExactArgs("/Set('2')").returns("/Set");
 					oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 						.returns("/resolved/child/metaPath");
-					oBindingMock.expects("doFetchQueryOptions")
+					oBindingMock.expects("doFetchOrGetQueryOptions")
 						.withExactArgs(sinon.match.same(oBinding.oContext))
 						.returns(SyncPromise.resolve(mLocalQueryOptions));
-					this.mock(_Helper).expects("fetchPropertyAndType")
+					oHelperMock.expects("fetchPropertyAndType")
 						.withExactArgs(sinon.match.same(fnFetchMetadata),
 							"/resolved/child/metaPath")
 						.returns(Promise.resolve().then(function () {
 							oBindingMock.expects("selectKeyProperties")
 								.exactly(oFixture.initial ? 1 : 0)
-								.withExactArgs(sinon.match.same(mLocalQueryOptions), "/Set");
+								.withExactArgs(sinon.match.same(mClonedQueryOptions), "/Set");
 							return {$kind : oFixture.$kind};
 						}));
 					oBindingMock.expects("getBaseForPathReduction")
 						.withExactArgs().returns("/base/path");
-					oMetaModelMock.expects("getReducedPath")
+					this.mock(oMetaModel).expects("getReducedPath")
 						.withExactArgs("/resolved/child/path", "/base/path")
 						.returns("/reduced/child/path");
 					oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -896,12 +905,11 @@ sap.ui.define([
 					oHelperMock.expects("getRelativePath")
 						.withExactArgs("/reduced/child/metapath", "/Set")
 						.returns("reducedChildMetaPath");
-					this.mock(_Helper).expects("clone").exactly(oFixture.initial ? 1 : 0)
+					oHelperMock.expects("clone").exactly(oFixture.initial ? 1 : 0)
 						.withExactArgs(sinon.match.same(mLocalQueryOptions))
-						.returns(mExtendResult);
+						.returns(mClonedQueryOptions);
 					oHelperMock.expects("wrapChildQueryOptions")
-						.withExactArgs("/Set", "reducedChildMetaPath",
-							sinon.match.same(mChildLocalQueryOptions),
+						.withExactArgs("/Set", "reducedChildMetaPath", {},
 							sinon.match.same(fnFetchMetadata))
 						.returns(mChildQueryOptions);
 					oBindingMock.expects("aggregateQueryOptions")
@@ -911,17 +919,20 @@ sap.ui.define([
 						.returns(oFixture.canMergeQueryOptions);
 
 					// code under test
-					oPromise = oBinding.fetchIfChildCanUseCache(oContext, "childPath",
-						SyncPromise.resolve(mChildLocalQueryOptions), "~bIsProperty~");
+					oPromise = oBinding.fetchIfChildCanUseCache(oContext, "childPath", undefined,
+						"~bIsProperty~");
 
+					assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+					assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
+					assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
+						["childPath"]);
 					return Promise.all([oPromise, oBinding.oCachePromise]).then(function (aResult) {
 						assert.strictEqual(aResult[0],
 							oFixture.hasChildQueryOptions && oFixture.canMergeQueryOptions
 								? "/reduced/child/path"
 								: undefined);
-						assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 						assert.strictEqual(oBinding.mAggregatedQueryOptions,
-							oFixture.initial ? mExtendResult : mAggregatedQueryOptions);
+							oFixture.initial ? mClonedQueryOptions : mAggregatedQueryOptions);
 						assert.strictEqual(oBinding.bAggregatedQueryOptionsInitial, false);
 						assert.strictEqual(oBinding.bHasPathReductionToParent, false);
 					});
@@ -946,8 +957,6 @@ sap.ui.define([
 					? SyncPromise.reject({}) // "Failed to create cache..."
 					: SyncPromise.resolve(Promise.resolve(oCache)), // it might become pending again
 				oMetaModel = {
-					fetchObject : function () {},
-					getMetaPath : function () {},
 					getReducedPath : function () {}
 				},
 				fnFetchMetadata = function () {},
@@ -955,7 +964,7 @@ sap.ui.define([
 					bAggregatedQueryOptionsInitial : false,
 					oCache : bRejected ? undefined : oCache,
 					oCachePromise : oCachePromise,
-					doFetchQueryOptions : function () {},
+					doFetchOrGetQueryOptions : function () {},
 					oModel : {
 						getMetaModel : function () {
 							return oMetaModel;
@@ -975,7 +984,6 @@ sap.ui.define([
 					? Context.createNewContext(this.oModel, oBinding, "/Set('2')")
 					: Context.create(this.oModel, oBinding, "/Set('2')"),
 				oHelperMock = this.mock(_Helper),
-				oMetaModelMock = this.mock(oMetaModel),
 				oModelMock = this.mock(oBinding.oModel),
 				oPromise;
 
@@ -985,14 +993,15 @@ sap.ui.define([
 			oHelperMock.expects("getMetaPath").withExactArgs("/Set('2')").returns("/Set");
 			oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 				.returns("/resolved/child/metaPath");
-			oBindingMock.expects("doFetchQueryOptions")
-				.returns(SyncPromise.resolve({}));
-			this.mock(_Helper).expects("fetchPropertyAndType")
+			oBindingMock.expects("doFetchOrGetQueryOptions").returns(undefined);
+			oHelperMock.expects("fetchPropertyAndType")
 				.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 				.returns(SyncPromise.resolve({$kind : "Property"}));
+			oHelperMock.expects("clone").never();
+			oBindingMock.expects("selectKeyProperties").never();
 			oBindingMock.expects("getBaseForPathReduction")
 				.withExactArgs().returns("/base/path");
-			oMetaModelMock.expects("getReducedPath")
+			this.mock(oMetaModel).expects("getReducedPath")
 				.withExactArgs("/resolved/child/path", "/base/path")
 				.returns("/reduced/child/path");
 			oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -1017,11 +1026,13 @@ sap.ui.define([
 			oPromise = oBinding.fetchIfChildCanUseCache(oContext, "childPath",
 				SyncPromise.resolve(mChildLocalQueryOptions), "~bIsProperty~");
 
+			assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+			assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
 			return Promise.all([oPromise, !bRejected && oCachePromise]).then(function (aResults) {
 				var sReducedPath = aResults[0];
 
 				assert.strictEqual(sReducedPath, undefined);
-				assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 				if (!bRejected) {
 					assert.strictEqual(oBinding.oCachePromise.getResult(),
 						oCachePromise.getResult());
@@ -1087,8 +1098,6 @@ sap.ui.define([
 }].forEach(function (oFixture) {
 	QUnit.test("fetchIfChildCanUseCache: late query options, " + oFixture.title, function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			oCachePromise = SyncPromise.resolve(oFixture.cache),
@@ -1101,7 +1110,7 @@ sap.ui.define([
 				oContext : {
 					getBinding : function () {}
 				},
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				isFirstCreateAtEnd : function () {},
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },
@@ -1122,7 +1131,6 @@ sap.ui.define([
 				oFixture.index),
 			oHelperMock = this.mock(_Helper),
 			mLateQueryOptions = {},
-			oMetaModelMock = this.mock(oMetaModel),
 			oModelMock = this.mock(oBinding.oModel),
 			oParentBinding = new ODataParentBinding(),
 			oPromise;
@@ -1140,14 +1148,15 @@ sap.ui.define([
 			.returns("/Set/navigation");
 		oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 			.returns("/resolved/child/metaPath");
-		oBindingMock.expects("doFetchQueryOptions")
-			.returns(SyncPromise.resolve({}));
-		this.mock(_Helper).expects("fetchPropertyAndType")
+		oBindingMock.expects("doFetchOrGetQueryOptions").returns({});
+		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 			.returns(SyncPromise.resolve(Promise.resolve({$kind : "Property"})));
+		oHelperMock.expects("clone").never();
+		oBindingMock.expects("selectKeyProperties").never();
 		oBindingMock.expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
-		oMetaModelMock.expects("getReducedPath")
+		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/resolved/child/path", "/base/path")
 			.returns("/reduced/child/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -1176,10 +1185,7 @@ sap.ui.define([
 		this.mock(oParentBinding).expects("fetchIfChildCanUseCache")
 			.exactly(oFixture.fetchIfChildCanUseCacheOnParentCount)
 			.withExactArgs(sinon.match.same(oBinding.oContext), "navigation",
-				sinon.match(function (p) {
-					return p.getResult() === mLateQueryOptions;
-				})
-			)
+				sinon.match.same(mLateQueryOptions))
 			.returns(SyncPromise.resolve(oFixture.rejected ? undefined : "/some/path"));
 
 		// code under test
@@ -1188,10 +1194,11 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 		assert.notStrictEqual(oBinding.oCachePromise, oCachePromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
 		return oBinding.oCachePromise.then(function (oCache0) {
-			var bUseCache = oPromise.getResult();
-
-			assert.strictEqual(bUseCache, oFixture.rejected ? undefined : "/reduced/child/path");
+			assert.strictEqual(oPromise.getResult(),
+				oFixture.rejected ? undefined : "/reduced/child/path");
 			assert.strictEqual(oCache0, oFixture.cache);
 		});
 	});
@@ -1207,8 +1214,6 @@ sap.ui.define([
 
 	QUnit.test(sTitle, function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			oCache0 = {
@@ -1226,7 +1231,7 @@ sap.ui.define([
 				bAggregatedQueryOptionsInitial : false,
 				oCache : oCache0,
 				oCachePromise : oCachePromise,
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },
 					oInterface : {
@@ -1243,7 +1248,6 @@ sap.ui.define([
 			mChildLocalQueryOptions = {},
 			oContext = Context.create(this.oModel, oBinding, "/Set('2')"),
 			oHelperMock = this.mock(_Helper),
-			oMetaModelMock = this.mock(oMetaModel),
 			oModelMock = this.mock(oBinding.oModel),
 			mNewQueryOptions = {},
 			oPromise;
@@ -1257,14 +1261,15 @@ sap.ui.define([
 		oHelperMock.expects("getMetaPath").withExactArgs("/Set('2')").returns("/Set");
 		oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path@foo.bar")
 			.returns("/resolved/child/metaPath@foo.bar");
-		oBindingMock.expects("doFetchQueryOptions")
-			.returns(SyncPromise.resolve({}));
-		this.mock(_Helper).expects("fetchPropertyAndType") // no @foo.bar here
+		oBindingMock.expects("doFetchOrGetQueryOptions").returns(undefined);
+		oHelperMock.expects("fetchPropertyAndType") // no @foo.bar here
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 			.returns(SyncPromise.resolve(Promise.resolve({$kind : "Property"})));
+		oHelperMock.expects("clone").never();
+		oBindingMock.expects("selectKeyProperties").never();
 		oBindingMock.expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
-		oMetaModelMock.expects("getReducedPath")
+		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/resolved/child/path@foo.bar", "/base/path")
 			.returns("/reduced/child/path@foo.bar");
 		oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path@foo.bar")
@@ -1303,10 +1308,11 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 		assert.notStrictEqual(oBinding.oCachePromise, oCachePromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath["childPath@foo.bar"], oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
+			["childPath@foo.bar"]);
 		return oBinding.oCachePromise.then(function (oResultingCache) {
-			var bUseCache = oPromise.getResult();
-
-			assert.strictEqual(bUseCache, undefined);
+			assert.strictEqual(oPromise.getResult(), undefined);
 			assert.strictEqual(oResultingCache, oFixture.shared ? oCache1 : oCache0);
 		});
 	});
@@ -1315,8 +1321,6 @@ sap.ui.define([
 	//*********************************************************************************************
 	QUnit.test("fetchIfChildCanUseCache: empty child path", function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			fnFetchMetadata = function () {},
@@ -1325,7 +1329,7 @@ sap.ui.define([
 				oCachePromise : SyncPromise.resolve(Promise.resolve(null)),
 				oContext : {},
 				wrapChildQueryOptions : function () {},
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				isFirstCreateAtEnd : function () {},
 				aggregateQueryOptions : function () {},
 				oModel : {
@@ -1340,31 +1344,35 @@ sap.ui.define([
 			}),
 			oBindingMock = this.mock(oBinding),
 			mChildQueryOptions = {},
-			mWrappedChildQueryOptions = {},
+			mClonedQueryOptions = {},
 			oContext = Context.create(this.oModel, oBinding, "/Set/~", Context.VIRTUAL),
 			oHelperMock = this.mock(_Helper),
 			mLocalQueryOptions = {},
-			oMetaModelMock = this.mock(oMetaModel),
 			oModelMock = this.mock(oBinding.oModel),
-			oPromise;
+			oPromise,
+			mWrappedChildQueryOptions = {};
 
+		oBinding.mCanUseCachePromiseByChildPath[""] = "~n/a~";
 		oModelMock.expects("resolve")
 			.withExactArgs("", sinon.match.same(oContext))
 			.returns("/resolved/child/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/Set/~").returns("/Set");
 		oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 			.returns("/resolved/child/metaPath");
-		oBindingMock.expects("doFetchQueryOptions")
+		oBindingMock.expects("doFetchOrGetQueryOptions")
 			.withExactArgs(sinon.match.same(oBinding.oContext))
 			.returns(SyncPromise.resolve(mLocalQueryOptions));
-		this.mock(_Helper).expects("fetchPropertyAndType")
+		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 			.returns(SyncPromise.resolve({$kind : "EntitySet"}));
+		oHelperMock.expects("clone")
+			.withExactArgs(sinon.match.same(mLocalQueryOptions))
+			.returns(mClonedQueryOptions);
 		oBindingMock.expects("selectKeyProperties")
-			.withExactArgs(sinon.match.same(mLocalQueryOptions), "/Set");
+			.withExactArgs(mClonedQueryOptions, "/Set");
 		oBindingMock.expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
-		oMetaModelMock.expects("getReducedPath")
+		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/resolved/child/path", "/base/path")
 			.returns("/reduced/child/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -1384,9 +1392,10 @@ sap.ui.define([
 		oPromise = oBinding.fetchIfChildCanUseCache(oContext, "",
 			SyncPromise.resolve(mChildQueryOptions), false);
 
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {"" : "~n/a~"}, "unchanged");
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/reduced/child/path");
-			assert.deepEqual(oBinding.aChildCanUseCachePromises, [oPromise]);
 			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
 		});
 	});
@@ -1401,8 +1410,6 @@ sap.ui.define([
 	}].forEach(function (oFixture, i) {
 		QUnit.test("fetchIfChildCanUseCache, error handling, " + i, function (assert) {
 			var oMetaModel = {
-					fetchObject : function () {},
-					getMetaPath : function () {},
 					getReducedPath : function () {}
 				},
 				fnFetchMetadata = function () {},
@@ -1414,7 +1421,7 @@ sap.ui.define([
 					oCache : undefined,
 					oCachePromise : SyncPromise.resolve(Promise.resolve(null)),
 					oContext : {},
-					doFetchQueryOptions : function () {
+					doFetchOrGetQueryOptions : function () {
 						return SyncPromise.resolve({});
 					},
 					oModel : {
@@ -1430,23 +1437,25 @@ sap.ui.define([
 				}),
 				oContext = Context.create(this.oModel, oBinding, "/Set('2')"),
 				oHelperMock = this.mock(_Helper),
-				oMetaModelMock = this.mock(oMetaModel),
 				oModelMock = this.mock(oBinding.oModel),
 				sPath = oFixture.sPath,
 				oPromise;
 
+			oBinding.mCanUseCachePromiseByChildPath[""] = "~n/a~";
 			oModelMock.expects("resolve")
 				.withExactArgs(sPath, sinon.match.same(oContext))
 				.returns("/resolved/child/path");
 			oHelperMock.expects("getMetaPath").withExactArgs("/Set('2')").returns("/Set");
 			oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 				.returns("/resolved/child/metaPath");
-			this.mock(_Helper).expects("fetchPropertyAndType")
+			oHelperMock.expects("fetchPropertyAndType")
 				.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 				.returns(SyncPromise.resolve(oFixture.oProperty));
+			oHelperMock.expects("clone").never();
+			this.mock(oBinding).expects("selectKeyProperties").never();
 			this.mock(oBinding).expects("getBaseForPathReduction")
 				.withExactArgs().returns("/base/path");
-			oMetaModelMock.expects("getReducedPath")
+			this.mock(oMetaModel).expects("getReducedPath")
 				.withExactArgs("/resolved/child/path", "/base/path")
 				.returns("/reduced/child/path");
 			oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -1462,8 +1471,10 @@ sap.ui.define([
 			// code under test
 			oPromise = oBinding.fetchIfChildCanUseCache(oContext, sPath);
 
-			return oPromise.then(function (bUseCache) {
-				assert.strictEqual(bUseCache, undefined);
+			assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+			assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {"" : "~n/a~"}, "unchanged");
+			return oPromise.then(function (sReducedPath) {
+				assert.strictEqual(sReducedPath, undefined);
 				assert.deepEqual(oBinding.mAggregatedQueryOptions, mOriginalAggregatedQueryOptions);
 				assert.strictEqual(oBinding.bHasPathReductionToParent, false);
 			});
@@ -1475,7 +1486,6 @@ sap.ui.define([
 	QUnit.test("fetchIfChildCanUseCache, advertised action #" + i, function (assert) {
 		var oMetaModel = {
 				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			oModel = {
@@ -1492,7 +1502,7 @@ sap.ui.define([
 				oCache : bImmutable ? oCache : undefined,
 				oCachePromise : SyncPromise.resolve(bImmutable ? oCache : Promise.resolve(oCache)),
 				oContext : {},
-				doFetchQueryOptions : function () {
+				doFetchOrGetQueryOptions : function () {
 					return SyncPromise.resolve({});
 				},
 				oModel : oModel,
@@ -1502,7 +1512,8 @@ sap.ui.define([
 			}),
 			oContext = Context.create(oModel, oBinding, "/Set('2')"),
 			oHelperMock = this.mock(_Helper),
-			sPath = "#foo.bar.AcFoo";
+			sPath = "#foo.bar.AcFoo",
+			oPromise;
 
 		this.mock(oBinding).expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
@@ -1525,12 +1536,16 @@ sap.ui.define([
 			.returns(SyncPromise.resolve());
 
 		// code under test
-		return oBinding.fetchIfChildCanUseCache(oContext, sPath, null, "~bIsProperty~")
-			.then(function (sReducedPath) {
-				assert.strictEqual(sReducedPath,
-					bImmutable ? undefined : "/reduced/child/path/" + sPath);
-				assert.strictEqual(oBinding.bHasPathReductionToParent, false);
-			});
+		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sPath, null, "~bIsProperty~");
+
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sPath], oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sPath]);
+		return oPromise.then(function (sReducedPath) {
+			assert.strictEqual(sReducedPath,
+				bImmutable ? undefined : "/reduced/child/path/" + sPath);
+			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		});
 	});
 });
 
@@ -1538,13 +1553,11 @@ sap.ui.define([
 ["$count", "EMPLOYEE_2_EQUIPMENTS/$count"].forEach(function (sChildPath) {
 	QUnit.test("fetchIfChildCanUseCache: " + sChildPath, function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			fnFetchMetadata = function () {},
 			oBinding = new ODataParentBinding({
-				doFetchQueryOptions : function () {
+				doFetchOrGetQueryOptions : function () {
 					return SyncPromise.resolve({});
 				},
 				oModel : {
@@ -1557,34 +1570,41 @@ sap.ui.define([
 				mParameters : {},
 				sPath : "/Set"
 			}),
-			oContext = Context.create(oBinding.oModel, oBinding, "/Set('2')"),
-			oHelperMock = this.mock(_Helper);
+			oContext = Context.create(oBinding.oModel, oBinding, "/Set($uid=id-1-23)/ToMany"),
+			oHelperMock = this.mock(_Helper),
+			oPromise;
 
 		this.mock(oBinding).expects("getBaseForPathReduction").withExactArgs()
 			.returns("/base/path");
 		this.mock(oBinding.oModel).expects("resolve")
 			.withExactArgs(sChildPath, sinon.match.same(oContext))
 			.returns("/resolved/child/path");
-		oHelperMock.expects("getMetaPath").withExactArgs("/Set('2')").returns("/Set");
+		oHelperMock.expects("getMetaPath").withExactArgs("/Set($uid=id-1-23)/ToMany")
+			.returns("/Set/ToMany");
 		oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
 			.returns("/resolved/child/metaPath");
-		this.mock(_Helper).expects("fetchPropertyAndType")
+		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/metaPath")
 			.returns(SyncPromise.resolve());
+		oHelperMock.expects("clone").never();
+		this.mock(oBinding).expects("selectKeyProperties").never();
 		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/resolved/child/path", "/base/path")
 			.returns("/reduced/child/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
 			.returns("/reduced/child/metaPath");
-		oHelperMock.expects("getRelativePath").withExactArgs("/reduced/child/metaPath", "/Set")
-			.returns(sChildPath);
+		oHelperMock.expects("getRelativePath")
+			.withExactArgs("/reduced/child/metaPath", "/Set/ToMany").returns(sChildPath);
 
 		// code under test
-		assert.strictEqual(
-			oBinding.fetchIfChildCanUseCache(oContext, sChildPath, null, "~bIsProperty~")
-				.getResult(),
-			"/reduced/child/path");
-		assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sChildPath, null, "~bIsProperty~");
+
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {}, "unchanged due to $uid");
+		return oPromise.then(function (sReducedPath) {
+			assert.strictEqual(sReducedPath, "/reduced/child/path");
+			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		});
 	});
 });
 
@@ -1618,6 +1638,8 @@ sap.ui.define([
 				.getResult(),
 			"/resolved/child/path");
 		assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		assert.deepEqual(oBinding.aChildCanUseCachePromises, [], "unchanged");
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {}, "unchanged");
 	});
 
 	//*********************************************************************************************
@@ -1647,14 +1669,14 @@ sap.ui.define([
 				.getResult(),
 			"/resolved/child/path");
 		assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		assert.deepEqual(oBinding.aChildCanUseCachePromises, [], "unchanged");
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {}, "unchanged");
 	});
 
 	//*********************************************************************************************
 [false, true].forEach(function (bReduced, i) {
 	QUnit.test("fetchIfChildCanUseCache, operation parameter #" + i, function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			fnFetchMetadata = function () {},
@@ -1673,17 +1695,17 @@ sap.ui.define([
 					getBinding : function () { return oParentBinding; },
 					getPath : function () { return "/Set('2')"; }
 				},
-				doFetchQueryOptions : function () {
+				doFetchOrGetQueryOptions : function () {
 					return SyncPromise.resolve({});
 				},
 				oModel : oModel,
 				mParameters : {},
 				sPath : "operation(...)"
 			}),
-			oChildQueryOptionsPromise = {},
+			mChildQueryOptions = {},
+			oChildQueryOptionsPromise = SyncPromise.resolve(Promise.resolve(mChildQueryOptions)),
 			oContext = Context.create(oModel, oBinding, "/Set('2')/operation(...)/$Parameter"),
 			oHelperMock = this.mock(_Helper),
-			oMetaModelMock = this.mock(oMetaModel),
 			oModelMock = this.mock(oBinding.oModel),
 			sPath = "foo/bar",
 			oPromise;
@@ -1698,10 +1720,12 @@ sap.ui.define([
 		oHelperMock.expects("getMetaPath")
 			.withExactArgs("/Set('2')/operation(...)/$Parameter/foo/bar")
 			.returns("/Set/operation/$Parameter/foo/bar");
-		this.mock(_Helper).expects("fetchPropertyAndType")
+		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/Set/operation/$Parameter/foo/bar")
 			.returns(SyncPromise.resolve());
-		oMetaModelMock.expects("getReducedPath")
+		oHelperMock.expects("clone").never();
+		this.mock(oBinding).expects("selectKeyProperties").never();
+		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/Set('2')/operation(...)/$Parameter/foo/bar", "/base/path")
 			.returns("/reduced/child/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/reduced/child/path")
@@ -1714,7 +1738,7 @@ sap.ui.define([
 			.returns("operation(...)/$Parameter/foo/bar");
 		this.mock(oParentBinding).expects("fetchIfChildCanUseCache").exactly(bReduced ? 1 : 0)
 			.withExactArgs(sinon.match.same(oBinding.oContext), "operation(...)/$Parameter/foo/bar",
-				sinon.match.same(oChildQueryOptionsPromise))
+				sinon.match.same(mChildQueryOptions), "~bIsProperty~")
 			.returns("/reduced/child/path");
 		this.mock(oBinding).expects("aggregateQueryOptions").never();
 
@@ -1722,6 +1746,9 @@ sap.ui.define([
 		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sPath, oChildQueryOptionsPromise,
 			"~bIsProperty~");
 
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sPath], oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sPath]);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/reduced/child/path");
 			assert.strictEqual(oBinding.bHasPathReductionToParent, bReduced);
@@ -1731,16 +1758,11 @@ sap.ui.define([
 
 //*********************************************************************************************
 	QUnit.test("fetchIfChildCanUseCache: non-deferred function", function (assert) {
-		var oMetaModel = {
-				getMetaPath : function (sPath) {
-					return _Helper.getMetaPath(sPath);
-				}
-			},
-			fnFetchMetadata = function () {},
+		var fnFetchMetadata = function () {},
 			oBinding = new ODataParentBinding({
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				oModel : {
-					getMetaModel : function () { return oMetaModel; },
+					getMetaModel : function () { return null; },
 					oInterface : {
 						fetchMetadata : fnFetchMetadata
 					},
@@ -1754,6 +1776,7 @@ sap.ui.define([
 			oModelMock = this.mock(oBinding.oModel),
 			oPromise;
 
+		oBinding.mCanUseCachePromiseByChildPath[""] = "~n/a~";
 		this.mock(oBinding).expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
 		oModelMock.expects("resolve")
@@ -1762,12 +1785,16 @@ sap.ui.define([
 		this.mock(_Helper).expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/path")
 			.returns(SyncPromise.resolve([{$isBound : true, $kind : "Function"}]));
-		this.mock(oBinding).expects("doFetchQueryOptions").withExactArgs(undefined)
+		this.mock(_Helper).expects("clone").never();
+		this.mock(oBinding).expects("selectKeyProperties").never();
+		this.mock(oBinding).expects("doFetchOrGetQueryOptions").withExactArgs(undefined)
 			.returns(SyncPromise.resolve());
 
 		// code under test
 		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sChildPath, SyncPromise.resolve());
 
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {"" : "~n/a~"}, "unchanged");
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, undefined);
 			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
@@ -1785,17 +1812,13 @@ sap.ui.define([
 				setQueryOptions : function () {}
 			},
 			oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function (sPath) {
-					return _Helper.getMetaPath(sPath);
-				},
 				getReducedPath : function () {}
 			},
 			fnFetchMetadata = function () {},
 			oBinding = new ODataParentBinding({
 				oCache : bImmutable ? oCache : undefined,
 				oCachePromise : SyncPromise.resolve(bImmutable ? oCache : Promise.resolve(oCache)),
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },
 					oInterface : {
@@ -1809,9 +1832,7 @@ sap.ui.define([
 			}),
 			oBindingMock = this.mock(oBinding),
 			sChildPath = "value",
-			mChildQueryOptions = {},
 			oContext = Context.create(this.oModel, oBinding, "/Function(foo=42)"),
-			oHelperMock = this.mock(_Helper),
 			mLocalQueryOptions = {},
 			oModelMock = this.mock(oBinding.oModel),
 			oPromise;
@@ -1822,27 +1843,30 @@ sap.ui.define([
 		this.mock(_Helper).expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata), "/resolved/child/path")
 			.returns(SyncPromise.resolve({$isCollection : true, $Type : "some.EntityType"}));
-		oBindingMock.expects("doFetchQueryOptions").withExactArgs(undefined)
+		oBindingMock.expects("doFetchOrGetQueryOptions").withExactArgs(undefined)
 			.returns(SyncPromise.resolve(mLocalQueryOptions));
+		this.mock(_Helper).expects("clone").withExactArgs(sinon.match.object).returns("~clone~");
 		oBindingMock.expects("selectKeyProperties")
-			.withExactArgs(sinon.match.object, "/Function"); // Note: w/o $Key nothing happens
+			.withExactArgs("~clone~", "/Function"); // Note: w/o $Key nothing happens
 		oBindingMock.expects("getBaseForPathReduction")
 			.withExactArgs().returns("/base/path");
 		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/resolved/child/path", "/base/path")
 			.returns("/reduced/child/path");
-		oHelperMock.expects("getRelativePath")
+		this.mock(_Helper).expects("getRelativePath")
 			.withExactArgs("/reduced/child/path", "/Function")
 			.returns("value");
 		oBindingMock.expects("aggregateQueryOptions")
-			.withExactArgs(sinon.match.same(mChildQueryOptions), "/Function", bImmutable,
-				"~bIsProperty~")
+			.withExactArgs({}, "/Function", bImmutable, "~bIsProperty~")
 			.returns(!bImmutable);
 
 		// code under test
-		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sChildPath,
-			SyncPromise.resolve(mChildQueryOptions), "~bIsProperty~");
+		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sChildPath, undefined,
+			"~bIsProperty~");
 
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sChildPath]);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, bImmutable ? undefined : "/reduced/child/path");
 			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
@@ -1864,38 +1888,27 @@ sap.ui.define([
 				getIndex : function () {},
 				getPath : function () { return "/TEAMS"; }
 			},
-			oModelMock = this.mock(oBinding.oModel),
-			oPromise,
-			oRootBinding = {
-				isSuspended : function () {}
-			};
+			oModelMock = this.mock(oBinding.oModel);
 
 		this.mock(oBinding).expects("getBaseForPathReduction").withExactArgs().returns("anything");
 		oModelMock.expects("resolve")
 			.withExactArgs("childPath", sinon.match.same(oContext))
 			.returns("/resolved/child/path");
+		this.mock(oBinding).expects("isRootBindingSuspended").withExactArgs().returns(true);
 
-		// getRootBinding cannot return undefined in fetchIfChildCanUseCache because it is
-		// called on a resolved binding see
-		// sap.ui.model.odata.v4.ODataBinding#fetchQueryOptionsForOwnCache
-		this.mock(oBinding).expects("getRootBinding").withExactArgs().returns(oRootBinding);
-		this.mock(oRootBinding).expects("isSuspended").withExactArgs().returns(true);
-
-		// code under test
-		oPromise = oBinding.fetchIfChildCanUseCache(oContext, "childPath", SyncPromise.resolve({}),
-			"~bIsProperty~");
-
-		return oPromise.then(function (bUseCache) {
-			assert.strictEqual(bUseCache, "/resolved/child/path");
-			assert.strictEqual(oBinding.bHasPathReductionToParent, false);
-		});
+		assert.strictEqual(
+			// code under test
+			oBinding.fetchIfChildCanUseCache(oContext, "childPath", {}, "~bIsProperty~")
+				.getResult(),
+			"/resolved/child/path");
+		assert.strictEqual(oBinding.bHasPathReductionToParent, false);
+		assert.deepEqual(oBinding.aChildCanUseCachePromises, [], "unchanged");
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {}, "unchanged");
 	});
 
 	//*********************************************************************************************
 	QUnit.test("fetchIfChildCanUseCache: delegate to parent binding", function (assert) {
 		var oMetaModel = {
-				fetchObject : function () {},
-				getMetaPath : function () {},
 				getReducedPath : function () {}
 			},
 			fnFetchMetadata = function () {},
@@ -1907,7 +1920,7 @@ sap.ui.define([
 					getBinding : function () { return oParentBinding; },
 					getPath : function () { return "/SalesOrderList('42')"; }
 				},
-				doFetchQueryOptions : function () {},
+				doFetchOrGetQueryOptions : function () {},
 				isFirstCreateAtEnd : function () {},
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },
@@ -1919,13 +1932,13 @@ sap.ui.define([
 				sPath : "SO_2_SOITEMS"
 			}),
 			oBindingMock = this.mock(oBinding),
+			sChildPath = "SOITEMS_2_SO/Note",
 			mChildQueryOptions = {},
 			oChildQueryOptionsPromise = SyncPromise.resolve(Promise.resolve(mChildQueryOptions)),
 			oContext = Context.create(this.oModel, oBinding,
 				"/SalesOrderList('42')/SO_2_SOITEMS('23')", 23),
 			oHelperMock = this.mock(_Helper),
 			mLocalQueryOptions = {},
-			oMetaModelMock = this.mock(oMetaModel),
 			oModelMock = this.mock(oBinding.oModel),
 			oPromise;
 
@@ -1941,16 +1954,18 @@ sap.ui.define([
 		oHelperMock.expects("getMetaPath")
 			.withExactArgs("/SalesOrderList('42')/SO_2_SOITEMS('23')/SOITEMS_2_SO/Note")
 			.returns("/SalesOrderList/SO_2_SOITEMS/SOITEMS_2_SO/Note");
-		oBindingMock.expects("doFetchQueryOptions")
+		oBindingMock.expects("doFetchOrGetQueryOptions")
 			.withExactArgs(sinon.match.same(oBinding.oContext))
 			.returns(SyncPromise.resolve(mLocalQueryOptions));
-		this.mock(_Helper).expects("fetchPropertyAndType")
+		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs(sinon.match.same(fnFetchMetadata),
 				"/SalesOrderList/SO_2_SOITEMS/SOITEMS_2_SO/Note")
 			.returns(SyncPromise.resolve({$kind : "Property"}));
+		this.mock(_Helper).expects("clone").never();
+		this.mock(oBinding).expects("selectKeyProperties").never();
 		oBindingMock.expects("getBaseForPathReduction")
 			.withExactArgs().returns("/SalesOrderList");
-		oMetaModelMock.expects("getReducedPath")
+		this.mock(oMetaModel).expects("getReducedPath")
 			.withExactArgs("/SalesOrderList('42')/SO_2_SOITEMS('23')/SOITEMS_2_SO/Note",
 				"/SalesOrderList")
 			.returns("/SalesOrderList('42')/Note");
@@ -1965,19 +1980,101 @@ sap.ui.define([
 			.returns("SO_2_SOITEMS('23')/SOITEMS_2_SO/Note");
 		this.mock(oParentBinding).expects("fetchIfChildCanUseCache")
 			.withExactArgs(sinon.match.same(oBinding.oContext),
-				"SO_2_SOITEMS('23')/SOITEMS_2_SO/Note", sinon.match.same(oChildQueryOptionsPromise))
+				"SO_2_SOITEMS('23')/SOITEMS_2_SO/Note", sinon.match.same(mChildQueryOptions),
+				"~bIsProperty~")
 			.returns(Promise.resolve("/SalesOrderList('42')/Note"));
 
 		// code under test
-		oPromise = oBinding.fetchIfChildCanUseCache(oContext, "SOITEMS_2_SO/Note",
-			oChildQueryOptionsPromise, "~bIsProperty~");
+		oPromise = oBinding.fetchIfChildCanUseCache(oContext, sChildPath, oChildQueryOptionsPromise,
+			"~bIsProperty~");
 
+		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], oPromise);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sChildPath]);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/SalesOrderList('42')/Note");
 			assert.strictEqual(oBinding.bHasPathReductionToParent, true);
 		});
 	});
 
+	//*********************************************************************************************
+[{
+	sOldReducedPath : undefined,
+	sChildPath : "childPath",
+	bSameMetaPath : true
+}, {
+	sOldReducedPath : "ignore/me",
+	sChildPath : "childPath",
+	bSameMetaPath : true
+}, {
+	sOldReducedPath : "ignore/me",
+	sChildPath : "child/path",
+	bSameMetaPath : true
+}, {
+	sOldReducedPath : "ignore/me",
+	sChildPath : "child/path",
+	bSameMetaPath : false
+}].forEach(function (o, i) {
+	QUnit.test("fetchIfChildCanUseCache: mCanUseCachePromiseByChildPath, #" + i, function (assert) {
+		var oCanUseCachePromise = SyncPromise.resolve(Promise.resolve(o.sOldReducedPath)),
+			oMetaModel = {
+				getReducedPath : function () {}
+			},
+			oBinding = new ODataParentBinding({
+				oContext : "do not use",
+				oModel : {
+					getMetaModel : function () { return oMetaModel; },
+					resolve : function () {}
+				}
+			}),
+			oContext = {
+				getIndex : function () {},
+				getPath : function () { return "/TEAMS"; }
+			},
+			sExpectedReducedPath = o.sOldReducedPath ? "/resolved/child/path" : undefined,
+			oHelperMock = this.mock(_Helper),
+			oPromise;
+
+		oBinding.mCanUseCachePromiseByChildPath[o.sChildPath] = oCanUseCachePromise;
+		oBinding.bHasPathReductionToParent = "~bHasPathReductionToParent~";
+		this.mock(oBinding).expects("getBaseForPathReduction").withExactArgs()
+			.returns("/base/path");
+		this.mock(oBinding.oModel).expects("resolve")
+			.withExactArgs(o.sChildPath, sinon.match.same(oContext))
+			.returns("/resolved/child/path");
+		this.mock(oBinding).expects("isRootBindingSuspended").withExactArgs().returns(false);
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(undefined).returns(false);
+		oHelperMock.expects("getMetaPath").never();
+		if (o.sChildPath === "child/path") {
+			oHelperMock.expects("getMetaPath").withExactArgs(o.sOldReducedPath).returns("A");
+			oHelperMock.expects("getMetaPath").withExactArgs("/resolved/child/path")
+				.returns(o.bSameMetaPath ? "A" : "B");
+		}
+		if (o.bSameMetaPath) {
+			this.mock(oMetaModel).expects("getReducedPath").never();
+		} else {
+			this.mock(oMetaModel).expects("getReducedPath")
+				.withExactArgs("/resolved/child/path", "/base/path").returns("/reduced/path");
+			sExpectedReducedPath = "/reduced/path";
+		}
+
+		// code under test
+		oPromise = oBinding.fetchIfChildCanUseCache(oContext, o.sChildPath, undefined, true);
+
+		return oPromise.then(function (sReducedPath) {
+			assert.strictEqual(sReducedPath, sExpectedReducedPath);
+
+			// Note: we wait as long as possible to check that s.th. is unchanged
+			assert.strictEqual(oBinding.bHasPathReductionToParent, "~bHasPathReductionToParent~",
+				"unchanged");
+			assert.deepEqual(oBinding.aChildCanUseCachePromises, [], "unchanged");
+			assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[o.sChildPath],
+				oCanUseCachePromise, "unchanged");
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [o.sChildPath]);
+		});
+	});
+});
+
 	//*********************************************************************************************
 [{
 	aggregatedQueryOptions : {$select : ["Name", "AGE"]},
@@ -2069,11 +2166,10 @@ sap.ui.define([
 					getMetaModel : function () { return oMetaModel; }
 				}
 			}),
-			oHelperMock = this.mock(_Helper),
 			oMetaModelMock = this.mock(oMetaModel);
 
-		oHelperMock.expects("merge")
-			.withExactArgs({}, sinon.match.same(oBinding.mLateQueryOptions))
+		this.mock(_Helper).expects("clone")
+			.withExactArgs(sinon.match.same(oBinding.mLateQueryOptions))
 			.returns(oFixture.aggregatedQueryOptions);
 		if (oFixture.metadata) {
 			Object.keys(oFixture.metadata).forEach(function (sMetaPath) {
@@ -3614,6 +3710,12 @@ sap.ui.define([
 					getPath : function () { return "baz(3)"; },
 					requestSideEffects : function () {}
 				},
+				oChild4 = {
+					oCache : {},
+					oOperation : "~truthy~",
+					// getPath must not be called
+					requestSideEffects : function () {}
+				},
 				sGroupId = "group",
 				oHelperMock = this.mock(_Helper),
 				oModel = {
@@ -3622,19 +3724,21 @@ sap.ui.define([
 				aPaths = [],
 				aPaths0 = ["A"],
 				aPaths1 = [/*empty!*/],
-				aPaths3 = ["A"],
+				aPaths3 = ["B"],
+				aPaths4 = ["C"],
 				oPromise0 = {index : 0}, // give deepEqual a chance
 				oPromise3 = {index : 3},
+				oPromise4 = {index : 4},
 				aPromises = [];
 
 			if (oFixture.oContext) {
 				oBinding.oModel = oModel;
 				this.mock(oModel).expects("getDependentBindings")
 					.withExactArgs(sinon.match.same(oFixture.oContext))
-					.returns([oChild0, oChild1, oChild2, oChild3]);
+					.returns([oChild0, oChild1, oChild2, oChild3, oChild4]);
 			} else {
 				this.mock(oBinding).expects("getDependentBindings").withExactArgs()
-					.returns([oChild0, oChild1, oChild2, oChild3]);
+					.returns([oChild0, oChild1, oChild2, oChild3, oChild4]);
 			}
 			oHelperMock.expects("stripPathPrefix")
 				.withExactArgs(oFixture.bPrefix ? "~/foo" : "foo", sinon.match.same(aPaths))
@@ -3655,12 +3759,18 @@ sap.ui.define([
 			this.mock(oChild3).expects("requestSideEffects")
 				.withExactArgs(sGroupId, sinon.match.same(aPaths3))
 				.returns(oPromise3);
+			oHelperMock.expects("stripPathPrefix")
+				.withExactArgs(oFixture.bPrefix ? "~" : "", sinon.match.same(aPaths))
+				.returns(aPaths4);
+			this.mock(oChild4).expects("requestSideEffects")
+				.withExactArgs(sGroupId, sinon.match.same(aPaths4))
+				.returns(oPromise4);
 
 			// code under test
 			oBinding.visitSideEffects(sGroupId, aPaths, oFixture.oContext, aPromises,
 				oFixture.bPrefix ? "~" : undefined);
 
-			assert.deepEqual(aPromises, [oPromise0, oPromise3]);
+			assert.deepEqual(aPromises, [oPromise0, oPromise3, oPromise4]);
 		});
 	});
 
@@ -3784,6 +3894,7 @@ sap.ui.define([
 
 		this.mock(oBinding).expects("getQueryOptionsFromParameters").withExactArgs()
 			.returns(mQueryOptions);
+		this.mock(_Helper).expects("clone").never();
 
 		// code under test
 		oPromise = oBinding.fetchResolvedQueryOptions();
@@ -3804,6 +3915,7 @@ sap.ui.define([
 
 		this.mock(oBinding).expects("getQueryOptionsFromParameters").withExactArgs()
 			.returns(mQueryOptions);
+		this.mock(_Helper).expects("clone").never();
 
 		// code under test
 		oPromise = oBinding.fetchResolvedQueryOptions();
@@ -3846,8 +3958,9 @@ sap.ui.define([
 			.returns("/resolved/path");
 		oHelperMock.expects("getMetaPath").withExactArgs("/resolved/path")
 			.returns("/meta/path");
-		this.mock(Object).expects("assign")
-			.withExactArgs({}, sinon.match.same(mQueryOptionsFromParameters), {$select : []})
+		oHelperMock.expects("clone")
+			.withExactArgs(sinon.match.same(mQueryOptionsFromParameters)).returns("~clone~");
+		this.mock(Object).expects("assign").withExactArgs({}, "~clone~", {$select : []})
 			.returns(mResolvedQueryOptions);
 		oHelperMock.expects("fetchPropertyAndType")
 			.withExactArgs("fnFetchMetadata", "/meta/path/foo")