diff --git a/org.adempiere.base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java
index 1ef26f3616..3d1078dfbb 100644
--- a/org.adempiere.base/src/org/compiere/model/MTable.java
+++ b/org.adempiere.base/src/org/compiere/model/MTable.java
@@ -153,12 +153,10 @@ public class MTable extends X_AD_Table implements ImmutablePOSupport
 		while (it.hasNext())
 		{
 			MTable retValue = it.next();
-			if (tableName.equalsIgnoreCase(retValue.getTableName())
-					&& retValue.getCtx() == ctx
-				)
+			if (tableName.equalsIgnoreCase(retValue.getTableName()))
 			{
-				return retValue;
-		}
+				return s_cache.get (ctx, retValue.get_ID(), e -> new MTable(ctx, e));
+			}
 		}
 		//
 		MTable retValue = null;
@@ -186,7 +184,7 @@ public class MTable extends X_AD_Table implements ImmutablePOSupport
 		if (retValue != null)
 		{
 			Integer key = Integer.valueOf(retValue.getAD_Table_ID());
-			s_cache.put (key, retValue);
+			s_cache.put (key, retValue, e -> new MTable(Env.getCtx(), e));
 		}
 		return retValue;
 	}	//	get