diff --git a/Simple.Data.OData/ODataTableAdapter.cs b/Simple.Data.OData/ODataTableAdapter.cs
index 615cb5fed..959633288 100644
--- a/Simple.Data.OData/ODataTableAdapter.cs
+++ b/Simple.Data.OData/ODataTableAdapter.cs
@@ -11,7 +11,6 @@ namespace Simple.Data.OData
     public partial class ODataTableAdapter : Adapter
     {
         private string _urlBase;
-        private ExpressionFormatter _expressionFormatter;
         private DatabaseSchema _schema;
 
         internal string UrlBase
@@ -29,7 +28,6 @@ protected override void OnSetup()
             base.OnSetup();
 
             _urlBase = Settings.Url;
-            _expressionFormatter = new ExpressionFormatter(DatabaseSchema.Get(_urlBase).FindTable);
             _schema = DatabaseSchema.Get(_urlBase);
         }
 
diff --git a/Simple.Data.OData/RequestExecutor.cs b/Simple.Data.OData/RequestExecutor.cs
index e769f3472..6b693a2a7 100644
--- a/Simple.Data.OData/RequestExecutor.cs
+++ b/Simple.Data.OData/RequestExecutor.cs
@@ -69,7 +69,7 @@ public RequestExecutor(string urlBase, DatabaseSchema schema, IAdapterTransactio
             var entry = ODataClient.CreateDataElement(entryMembers.Properties);
             foreach (var association in entryMembers.AssociationsByValue)
             {
-                CreateLink(entry, tableName, association);
+                CreateLinkElement(entry, tableName, association);
             }
 
             var commandText = GetTableActualName(tableName);
@@ -96,7 +96,7 @@ public int UpdateEntry(string tableName, IDictionary<string, object> entry, IDic
             var entryElement = ODataClient.CreateDataElement(entryMembers.Properties);
             foreach (var association in entryMembers.AssociationsByValue)
             {
-                CreateLink(entryElement, tableName, association);
+                CreateLinkElement(entryElement, tableName, association);
             }
 
             var command = new HttpCommand(merge ? RestVerbs.MERGE : RestVerbs.PUT, commandText, data, entryElement.ToString());
@@ -124,7 +124,7 @@ public int DeleteEntry(string tableName, IDictionary<string, object> entry, IAda
         public IEnumerable<IEnumerable<IEnumerable<KeyValuePair<string, object>>>> ExecuteFunction(string functionName, IDictionary<string, object> parameters)
         {
             var function = _schema.FindFunction(functionName);
-            var formattedParameters = new ExpressionFormatter(_schema.FindTable).Format(parameters, "&");
+            var formattedParameters = _expressionFormatter.Format(parameters, "&");
             var commandText = function.ActualName + "?" + formattedParameters;
             var command = new HttpCommand(function.HttpMethod.ToUpper(), commandText.ToString());
             _requestBuilder.AddCommandToRequest(command);
@@ -140,7 +140,7 @@ private HttpCommand CreateLinkCommand(string tableName, string associationName,
             return new HttpCommand(linkMethod, commandText, null, linkEntry.ToString(), true);
         }
 
-        private void CreateLink(XElement entry, string tableName, KeyValuePair<string, object> associatedData)
+        private void CreateLinkElement(XElement entry, string tableName, KeyValuePair<string, object> associatedData)
         {
             if (associatedData.Value == null)
                 return;