diff --git a/base/src/org/compiere/model/MOrg.java b/base/src/org/compiere/model/MOrg.java
index b65d1b220c..d87496b651 100644
--- a/base/src/org/compiere/model/MOrg.java
+++ b/base/src/org/compiere/model/MOrg.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Organization Model
@@ -29,45 +32,26 @@ import org.compiere.util.*;
  */
 public class MOrg extends X_AD_Org
 {
+	private static final long serialVersionUID = 1L;
+
+
 	/**
-	 * 	Get Organizations Of Client
+	 * 	Get Active Organizations Of Client
 	 *	@param po persistent object
 	 *	@return array of orgs
 	 */
 	public static MOrg[] getOfClient (PO po)
 	{
-		ArrayList<MOrg> list = new ArrayList<MOrg>();
-		String sql = "SELECT * FROM AD_Org WHERE AD_Client_ID=? ORDER BY Value";
-		PreparedStatement pstmt = null;
-		try
+		List<MOrg> list = new Query(po.getCtx(), Table_Name, "AD_Client_ID=?", null)
+								.setOrderBy(COLUMNNAME_Value)
+								.setOnlyActiveRecords(true)
+								.setParameters(new Object[]{po.getAD_Client_ID()})
+								.list();
+		for (MOrg org : list)
 		{
-			pstmt = DB.prepareStatement (sql, null);
-			pstmt.setInt (1, po.getAD_Client_ID());
-			ResultSet rs = pstmt.executeQuery ();
-			while (rs.next ())
-				list.add (new MOrg (po.getCtx(), rs, null));
-			rs.close ();
-			pstmt.close ();
-			pstmt = null;
+			s_cache.put(org.get_ID(), org);
 		}
-		catch (Exception e)
-		{
-			s_log.log (Level.SEVERE, sql, e);
-		}
-		try
-		{
-			if (pstmt != null)
-				pstmt.close ();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
-		}
-		
-		MOrg[] retValue = new MOrg[list.size ()];
-		list.toArray (retValue);
-		return retValue;
+		return list.toArray(new MOrg[list.size()]);
 	}	//	getOfClient
 	
 	/**
@@ -78,18 +62,15 @@ public class MOrg extends X_AD_Org
 	 */
 	public static MOrg get (Properties ctx, int AD_Org_ID)
 	{
-		Integer key = new Integer (AD_Org_ID);
-		MOrg retValue = (MOrg) s_cache.get (key);
+		MOrg retValue = s_cache.get (AD_Org_ID);
 		if (retValue != null)
 			return retValue;
 		retValue = new MOrg (ctx, AD_Org_ID, null);
 		if (retValue.get_ID () != 0)
-			s_cache.put (key, retValue);
+			s_cache.put (AD_Org_ID, retValue);
 		return retValue;
 	}	//	get
 
-	/**	Logger	*/
-	private static CLogger 			s_log = CLogger.getCLogger (MOrg.class);
 	/**	Cache						*/
 	private static CCache<Integer,MOrg>	s_cache	= new CCache<Integer,MOrg>(Table_Name, 50);
 	
@@ -135,8 +116,6 @@ public class MOrg extends X_AD_Org
 		setName (name);
 	}	//	MOrg
 
-	/**	Org Info						*/
-	private MOrgInfo	m_info = null;
 	/**	Linked Business Partner			*/
 	private Integer 	m_linkedBPartner = null;
 
@@ -146,9 +125,7 @@ public class MOrg extends X_AD_Org
 	 */
 	public MOrgInfo getInfo()
 	{
-		if (m_info == null)
-			m_info = MOrgInfo.get (getCtx(), getAD_Org_ID());
-		return m_info;
+		return MOrgInfo.get(getCtx(), getAD_Org_ID());
 	}	//	getMOrgInfo
 
 
@@ -166,8 +143,8 @@ public class MOrg extends X_AD_Org
 		if (newRecord)
 		{
 			//	Info
-			m_info = new MOrgInfo (this);
-			m_info.save();
+			MOrgInfo info = new MOrgInfo (this);
+			info.saveEx();
 			//	Access
 			MRoleOrgAccess.createForOrg (this);
 			MRole.getDefault(getCtx(), true);	//	reload
diff --git a/base/src/org/compiere/model/MOrgInfo.java b/base/src/org/compiere/model/MOrgInfo.java
index ec2df28b35..7489878abe 100644
--- a/base/src/org/compiere/model/MOrgInfo.java
+++ b/base/src/org/compiere/model/MOrgInfo.java
@@ -15,20 +15,25 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.CCache;
 
 /**
  *	Organization Info Model
  *	
  *  @author Jorg Janke
  *  @version $Id: MOrgInfo.java,v 1.3 2006/07/30 00:58:37 jjanke Exp $
+ *  
+ *  @author Teo Sarca, www.arhipac.ro
+ *  		<li>BF [ 2107083 ] Caching of MOrgInfo issue
  */
 public class MOrgInfo extends X_AD_OrgInfo
-{	
+{
+	private static final long serialVersionUID = 1L;
+
+
 	/**
 	 * 	Load Constructor
 	 *	@param ctx context
@@ -37,39 +42,23 @@ public class MOrgInfo extends X_AD_OrgInfo
 	 */
 	public static MOrgInfo get (Properties ctx, int AD_Org_ID)
 	{
-		MOrgInfo retValue = null;
-		String sql = "SELECT * FROM AD_OrgInfo WHERE AD_Org_ID=?";
-		PreparedStatement pstmt = null;
-		try
+		MOrgInfo retValue = s_cache.get(AD_Org_ID);
+		if (retValue != null)
 		{
-			pstmt = DB.prepareStatement(sql, null);
-			pstmt.setInt(1, AD_Org_ID);
-			ResultSet rs = pstmt.executeQuery();
-			if (rs.next())
-				retValue = new MOrgInfo (ctx, rs, null);
-			rs.close();
-			pstmt.close();
-			pstmt = null;
+			return retValue;
 		}
-		catch (Exception e)
+		retValue = new Query(ctx, Table_Name, "AD_Org_ID=?", null)
+						.setParameters(new Object[]{AD_Org_ID})
+						.first();
+		if (retValue != null)
 		{
-			s_log.log(Level.SEVERE, sql, e);
-		}
-		try
-		{
-			if (pstmt != null)
-				pstmt.close();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
+			s_cache.put(AD_Org_ID, retValue);
 		}
 		return retValue;
 	}	//	get
 
-	/** Static Logger					*/
-	private static CLogger		s_log = CLogger.getCLogger (MOrgInfo.class);
+	/**	Cache						*/
+	private static CCache<Integer,MOrgInfo>	s_cache	= new CCache<Integer,MOrgInfo>(Table_Name, 50);
 
 	
 	/**************************************************************************