kmx.io/ex_ovh

diff --git a/lib/client.ex b/lib/client.ex
index 84bc091..44f903c 100644
--- a/lib/client.ex
+++ b/lib/client.ex
@@ -35,8 +35,8 @@ defmodule ExOvh.Client do
       end
 
 
-      def ovh_prep_request({method, uri, params} = query, opts \\ %{}) do
-        ExOvh.Ovh.Auth.prep_request(__MODULE__, query, opts)
+      def ovh_prepare_request({method, uri, params} = query, opts \\ %{}) do
+        ExOvh.Ovh.Auth.prepare_request(__MODULE__, query, opts)
       end
 
 
@@ -45,8 +45,8 @@ defmodule ExOvh.Client do
       end
 
 
-      def hubic_prep_request({method, uri, params} = query, opts \\ %{}) do
-        ExOvh.Hubic.Auth.prep_request(__MODULE__, query, opts)
+      def hubic_prepare_request({method, uri, params} = query, opts \\ %{}) do
+        ExOvh.Hubic.Auth.prepare_request(__MODULE__, query, opts)
       end
 
 
@@ -72,7 +72,7 @@ defmodule ExOvh.Client do
   Prepares all elements necessary prior to making a request to the ovh api.
   Returns a tuple `{method, uri, options}`
   """
-  @callback ovh_prep_request(query :: raw_query_t)
+  @callback ovh_prepare_request(query :: raw_query_t)
                              :: query_t
 
 
@@ -88,7 +88,7 @@ defmodule ExOvh.Client do
   Prepares all elements necessary prior to making a request to the hubic api.
   Returns a tuple `{method, uri, options}`
   """
-  @callback hubic_prep_request(query :: raw_query_t)
+  @callback hubic_prepare_request(query :: raw_query_t)
                                :: query_t
 
 
diff --git a/lib/ex_ovh.ex b/lib/ex_ovh.ex
index da33c39..4e43985 100644
--- a/lib/ex_ovh.ex
+++ b/lib/ex_ovh.ex
@@ -1,8 +1,7 @@
 defmodule ExOvh do
   use ExOvh.Client, otp_app: :ex_ovh
 
-  # <<TODO>> Remove application later so that ExOvh is started
-  # <<TODO>> within a supervision tree on demand
+  # <<TODO>> Remove application later so that ExOvh is started within a supervision tree on demand
   use Application
 
   def start(_type, _args) do
diff --git a/lib/hubic/auth.ex b/lib/hubic/auth.ex
index 45ba23a..6e67fc3 100644
--- a/lib/hubic/auth.ex
+++ b/lib/hubic/auth.ex
@@ -1,6 +1,6 @@
 defmodule ExOvh.Hubic.Auth do
   @moduledoc ~s"""
-    Delegates the prep_request to the appropriate module and function
+    Delegates the prepare_request to the appropriate module and function
     depending on the opts specified.
     `%{ openstack: :true }` ==> delegates the query to the OpenstackApi.Auth Module
     `%{ }` ==> delegates the query to the HubicApi.Auth Module
@@ -13,17 +13,17 @@ defmodule ExOvh.Hubic.Auth do
   ############################
 
 
-  @spec prep_request(query :: ExOvh.Client.raw_query_t, opts :: map())
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t, opts :: map())
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query, opts), do: prep_request(ExOvh, query, opts)
+  def prepare_request({method, uri, params} = query, opts), do: prepare_request(ExOvh, query, opts)
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t, opts :: map())
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t, opts :: map())
                      :: ExOvh.Client.query_t
-  def prep_request(client, {method, uri, params} = query, %{openstack: :true} = opts) do
-    OpenstackAuth.prep_request(client, query)
+  def prepare_request(client, {method, uri, params} = query, %{openstack: :true} = opts) do
+    OpenstackAuth.prepare_request(client, query)
   end
-  def prep_request(client, {method, uri, params} = query, opts) do
-    HubicAuth.prep_request(client, query)
+  def prepare_request(client, {method, uri, params} = query, opts) do
+    HubicAuth.prepare_request(client, query)
   end
 
 
diff --git a/lib/hubic/hubic_api/auth.ex b/lib/hubic/hubic_api/auth.ex
index 84100b7..62ad95b 100644
--- a/lib/hubic/hubic_api/auth.ex
+++ b/lib/hubic/hubic_api/auth.ex
@@ -10,16 +10,16 @@ defmodule ExOvh.Hubic.HubicApi.Auth do
   # Public
   ###################
   
-  @spec prep_request(query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query), do: prep_request(ExOvh, query)
+  def prepare_request({method, uri, params} = query), do: prepare_request(ExOvh, query)
 
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t)
                     :: ExOvh.Client.query_t
-  def prep_request(client, query)
+  def prepare_request(client, query)
 
-  def prep_request(client, {method, uri, params} = query) when method in [:get, :delete] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:get, :delete] do
     config = config(client)
     uri = uri(config, uri)
     if params !== :nil and params !== "", do: uri = uri <> URI.encode_query(params)
@@ -27,7 +27,7 @@ defmodule ExOvh.Hubic.HubicApi.Auth do
     {method, uri, options}
   end
 
-  def prep_request(client, {method, uri, params} = query) when method in [:post, :put] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:post, :put] do
     config = config(client)
     uri = uri(config, uri)
     if params !== "" and params !== :nil, do: params = Poison.encode!(params)
diff --git a/lib/hubic/hubic_api/request.ex b/lib/hubic/hubic_api/request.ex
index d932bc7..ac214d2 100644
--- a/lib/hubic/hubic_api/request.ex
+++ b/lib/hubic/hubic_api/request.ex
@@ -16,7 +16,7 @@ defmodule ExOvh.Hubic.HubicApi.Request do
   @spec request(client :: atom, query :: ExOvh.Client.raw_query_t, retries :: integer)
                 :: {:ok, ExOvh.Client.response_t} | {:error, ExOvh.Client.response_t}
   def request(client, {method, uri, params} = query, retries \\ 0) do
-    {method, uri, options} = Auth.prep_request(client, query)
+    {method, uri, options} = Auth.prepare_request(client, query)
     resp = HTTPotion.request(method, uri, options)
     resp =
     %{
diff --git a/lib/hubic/openstack_api/auth.ex b/lib/hubic/openstack_api/auth.ex
index 4066e5b..9a18c10 100644
--- a/lib/hubic/openstack_api/auth.ex
+++ b/lib/hubic/openstack_api/auth.ex
@@ -10,22 +10,22 @@ defmodule ExOvh.Hubic.OpenstackApi.Auth do
   ############################
 
 
-  @spec prep_request(query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query), do: prep_request(ExOvh, query)
+  def prepare_request({method, uri, params} = query), do: prepare_request(ExOvh, query)
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request(client, query)
+  def prepare_request(client, query)
 
-  def prep_request(client, {method, uri, params} = query) when method in [:get, :delete] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:get, :delete] do
     uri =  Cache.get_endpoint(client) <> uri
     if params !== :nil and params !== "", do: uri = uri <> URI.encode_query(params)
     options = %{ headers: headers(client), timeout: @timeout }
     {method, uri, options}
   end
 
-  def prep_request(client, {method, uri, params} = query) when method in [:post, :put] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:post, :put] do
     uri =  Cache.get_endpoint(client) <> uri
     if params !== "" and params !== :nil and method in [:post, :put], do: params = Poison.encode!(params)
     options = %{ body: params, headers: headers(client), timeout: @timeout }
diff --git a/lib/hubic/openstack_api/request.ex b/lib/hubic/openstack_api/request.ex
index 98b9afe..61c0f2e 100644
--- a/lib/hubic/openstack_api/request.ex
+++ b/lib/hubic/openstack_api/request.ex
@@ -16,7 +16,7 @@ defmodule ExOvh.Hubic.OpenstackApi.Request do
   @spec request(client :: atom, query :: ExOvh.Client.raw_query_t)
                 :: {:ok, ExOvh.Client.response_t} | {:error, ExOvh.Client.response_t}
   def request(client, {method, uri, params} = query) do
-    {method, uri, options} = Auth.prep_request(client, query)
+    {method, uri, options} = Auth.prepare_request(client, query)
     resp = HTTPotion.request(method, uri, options)
     resp =
     %{
diff --git a/lib/mix/tasks/ovh.ex b/lib/mix/tasks/ovh.ex
index ec2f57a..498da2c 100644
--- a/lib/mix/tasks/ovh.ex
+++ b/lib/mix/tasks/ovh.ex
@@ -243,7 +243,7 @@ defmodule Mix.Tasks.Ovh do
     LoggingUtils.log_mod_func_line(__ENV__, :debug)
     body = %{ accessRules: access_rules, redirection: redirect_uri }
     query = {:post, consumer_key_uri(opts_map), body}
-    {method, uri, options} = Auth.ovh_prep_request(opts_map, query)
+    {method, uri, options} = Auth.ovh_prepare_request(opts_map, query)
     options = Map.put(options, :headers, Map.merge(@default_headers, %{ "X-Ovh-Application": app_key(opts_map)}))
     body = HTTPotion.request(method, consumer_key_uri(opts_map), options) |> Map.get(:body) |> Poison.decode!()
     {Map.get(body, "consumerKey"), Map.get(body, "validationUrl")}
diff --git a/lib/ovh/auth.ex b/lib/ovh/auth.ex
index d2e25d6..7d0709b 100644
--- a/lib/ovh/auth.ex
+++ b/lib/ovh/auth.ex
@@ -1,6 +1,6 @@
 defmodule ExOvh.Ovh.Auth do
   @moduledoc ~s"""
-    Delegates the prep_request to the appropriate module and function
+    Delegates the prepare_request to the appropriate module and function
     depending on the opts specified.
     `%{ openstack: :true }` ==> delegates the query to the OpenstackApi.Auth Module
     `%{ }` ==> delegates the query to the HubicApi.Auth Module
@@ -13,17 +13,17 @@ defmodule ExOvh.Ovh.Auth do
   ############################
 
 
-  @spec prep_request(query :: ExOvh.Client.raw_query_t, opts :: map())
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t, opts :: map())
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query, opts), do: prep_request(ExOvh, query, opts)
+  def prepare_request({method, uri, params} = query, opts), do: prepare_request(ExOvh, query, opts)
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t, opts :: map())
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t, opts :: map())
                      :: ExOvh.Client.query_t
-  def prep_request(client, {method, uri, params} = query, %{openstack: :true} = opts) do
-    OpenstackAuth.prep_request(client, query)
+  def prepare_request(client, {method, uri, params} = query, %{openstack: :true} = opts) do
+    OpenstackAuth.prepare_request(client, query)
   end
-  def prep_request(client, {method, uri, params} = query, opts) do
-    OvhAuth.prep_request(client, query)
+  def prepare_request(client, {method, uri, params} = query, opts) do
+    OvhAuth.prepare_request(client, query)
   end
 
 
diff --git a/lib/ovh/cache.ex b/lib/ovh/cache.ex
deleted file mode 100644
index b2fcd53..0000000
--- a/lib/ovh/cache.ex
+++ /dev/null
@@ -1,96 +0,0 @@
-defmodule ExOvh.Ovh.Cache do
-  @moduledoc ~s"""
-    Caches the ovh api time diff
-  """
-  use GenServer
-  alias ExOvh.Ovh.Defaults
-
-  ############################
-  # Public
-  ###########################
-
-  @doc "Starts a genserver to keep state on the config and time diff"
-  def start_link({client, config, opts}) do
-    LoggingUtils.log_mod_func_line(__ENV__, :debug)
-    GenServer.start_link(__MODULE__, {client, config, opts}, [name: gen_server_name(client)])
-  end
-
-
-  @doc "Retrieves the ovh api time diff from the cache"
-  def get_time_diff(client) do
-    GenServer.call(gen_server_name(client), :get_diff)
-  end
-  @doc "Retrieves the ovh config map"
-  def get_config(client) do
-    GenServer.call(gen_server_name(client), :get_config)
-  end
-
-
-  ############################
-  # Genserver Callbacks
-  ###########################
-
-  def init({client, config, opts}) do
-    LoggingUtils.log_mod_func_line(__ENV__, :debug)
-    diff = calculate_diff(config)
-    {:ok, {config, diff}}
-  end
-
-  def handle_call(:get_diff, _from, {config, diff}) do
-    LoggingUtils.log_mod_func_line(__ENV__, :debug)
-    {:reply, diff, {config, diff}}
-  end
-
-  def handle_call(:get_config, _from, {config, diff}) do
-    LoggingUtils.log_mod_func_line(__ENV__, :debug)
-    {:reply, config, {config, diff}}
-  end
-
-  def handle_cast({:set_diff, new_diff}, {config, diff}) do
-    LoggingUtils.log_mod_func_line(__ENV__, :debug)
-    {:noreply, {config, new_diff}}
-  end
-
-  def terminate(:shutdown, state) do
-    LoggingUtils.log_mod_func_line(__ENV__, :warn)
-    LoggingUtils.log_return("gen_server #{__MODULE__} shutting down", :warn)
-    :ok
-  end
-
-
-  ############################
-  # Private
-  ###########################
-
-
-  defp gen_server_name(client), do: String.to_atom(Atom.to_string(client) <> Atom.to_string(__MODULE__))
-  defp endpoint(config), do: Defaults.endpoints()[config[:endpoint]]
-  defp api_version(config), do: config[:api_version]
-
-
-  defp api_time_request(config) do
-    time_uri = endpoint(config) <> api_version(config) <> "/auth/time"
-    options = %{ headers: %{ "Content-Type": "application/json; charset=utf-8" }, timeout: 10_000 }
-    api_time = HTTPotion.request(:get, time_uri, options) |> Map.get(:body) |> Poison.decode!()
-  end
-
-
-  defp calculate_diff(config) do
-    api_time = api_time_request(config)
-    os_t = :os.system_time(:seconds)
-    os_t - api_time
-  end
-
-
-  #Caches the ovh api time diff
-  defp set_time_diff(client) do
-    config = get_config(client)
-    set_time_diff(client, config)
-  end
-  defp set_time_diff(client, config) when is_map(config) do
-    diff = calculate_diff(config)
-    GenServer.cast(gen_server_name(client), {:set_diff, diff})
-  end
-
-
-end
\ No newline at end of file
diff --git a/lib/ovh/openstack_api/auth.ex b/lib/ovh/openstack_api/auth.ex
index c57944c..e39d5f9 100644
--- a/lib/ovh/openstack_api/auth.ex
+++ b/lib/ovh/openstack_api/auth.ex
@@ -1,7 +1,7 @@
 defmodule ExOvh.Ovh.Openstack.Auth do
   alias LoggingUtils
   alias ExOvh.Ovh.Defaults
-  alias ExOvh.Ovh.Cache
+  alias ExOvh.Ovh.OvhApi.Cache
 
   @default_headers %{ "Content-Type": "application/json; charset=utf-8" }
   @methods [:get, :post, :put, :delete]
@@ -13,15 +13,15 @@ defmodule ExOvh.Ovh.Openstack.Auth do
   ############################
 
 
-  @spec prep_request(query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query), do: prep_request(ExOvh, query)
+  def prepare_request({method, uri, params} = query), do: prepare_request(ExOvh, query)
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request(client, query)
+  def prepare_request(client, query)
 
-  def prep_request(client, {method, uri, params} = query) when method in [:get, :delete] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:get, :delete] do
     uri = uri(config, uri)
     config = config(client)
     if params !== :nil and params !== "", do: uri = uri <> URI.encode_query(params)
@@ -31,7 +31,7 @@ defmodule ExOvh.Ovh.Openstack.Auth do
     {method, uri, options}
   end
 
-  def prep_request(client, {method, uri, params} = query) when method in [:post, :put] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:post, :put] do
     uri = uri(config, uri)
     config = config(client)
     consumer_key = get_consumer_key(config)
diff --git a/lib/ovh/openstack_api/request.ex b/lib/ovh/openstack_api/request.ex
index 9b79ca0..372165f 100644
--- a/lib/ovh/openstack_api/request.ex
+++ b/lib/ovh/openstack_api/request.ex
@@ -1,8 +1,7 @@
 defmodule ExOvh.Ovh.Openstack.Request do
-  alias ExOvh.Ovh.Auth
-  alias LoggingUtils
+  alias ExOvh.Ovh.Openstack.Auth
+  alias ExOvh.Ovh.OvhApi.Cache, as: ClientCache
   alias ExOvh.Ovh.Defaults
-  alias ExOvh.Ovh.Cache
 
   ############################
   # Public
@@ -18,7 +17,7 @@ defmodule ExOvh.Ovh.Openstack.Request do
                :: {:ok, ExOvh.Client.response_t} | {:error, ExOvh.Client.response_t}
   def request(client, {method, uri, params} = query) do
     config = config(client)
-    {method, uri, options} = Auth.prep_request(client, query)
+    {method, uri, options} = Auth.prepare_request(client, query)
     resp = HTTPotion.request(method, uri, options)
     resp =
     %{
@@ -39,8 +38,8 @@ defmodule ExOvh.Ovh.Openstack.Request do
   ############################
 
 
-  defp config(), do: Cache.get_config(ExOvh)
-  defp config(client), do: Cache.get_config(client)
+  defp config(), do: ClientCache.get_config(ExOvh)
+  defp config(client), do: ClientCache.get_config(client)
   defp endpoint(config), do: Defaults.endpoints()[config[:endpoint]]
   defp api_version(config), do: config[:api_version]
 
diff --git a/lib/ovh/ovh_api/auth.ex b/lib/ovh/ovh_api/auth.ex
index eb20d0f..17bca84 100644
--- a/lib/ovh/ovh_api/auth.ex
+++ b/lib/ovh/ovh_api/auth.ex
@@ -1,7 +1,7 @@
 defmodule ExOvh.Ovh.OvhApi.Auth do
   alias LoggingUtils
   alias ExOvh.Ovh.Defaults
-  alias ExOvh.Ovh.Cache
+  alias ExOvh.Ovh.OvhApi.Cache
 
   @default_headers %{ "Content-Type": "application/json; charset=utf-8" }
   @methods [:get, :post, :put, :delete]
@@ -13,15 +13,15 @@ defmodule ExOvh.Ovh.OvhApi.Auth do
   ############################
 
 
-  @spec prep_request(query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request({method, uri, params} = query), do: prep_request(ExOvh, query)
+  def prepare_request({method, uri, params} = query), do: prepare_request(ExOvh, query)
 
-  @spec prep_request(client :: atom, query :: ExOvh.Client.raw_query_t)
+  @spec prepare_request(client :: atom, query :: ExOvh.Client.raw_query_t)
                      :: ExOvh.Client.query_t
-  def prep_request(client, query)
+  def prepare_request(client, query)
 
-  def prep_request(client, {method, uri, params} = query) when method in [:get, :delete] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:get, :delete] do
     uri = uri(config, uri)
     config = config(client)
     if params !== :nil and params !== "", do: uri = uri <> URI.encode_query(params)
@@ -31,7 +31,7 @@ defmodule ExOvh.Ovh.OvhApi.Auth do
     {method, uri, options}
   end
 
-  def prep_request(client, {method, uri, params} = query) when method in [:post, :put] do
+  def prepare_request(client, {method, uri, params} = query) when method in [:post, :put] do
     uri = uri(config, uri)
     config = config(client)
     consumer_key = get_consumer_key(config)
@@ -42,7 +42,6 @@ defmodule ExOvh.Ovh.OvhApi.Auth do
   end
 
 
-
   ############################
   # Private
   ############################
diff --git a/lib/ovh/ovh_api/cache.ex b/lib/ovh/ovh_api/cache.ex
new file mode 100644
index 0000000..2ea1eba
--- /dev/null
+++ b/lib/ovh/ovh_api/cache.ex
@@ -0,0 +1,96 @@
+defmodule ExOvh.Ovh.OvhApi.Cache do
+  @moduledoc ~s"""
+    Caches the ovh api time diff
+  """
+  use GenServer
+  alias ExOvh.Ovh.Defaults
+
+  ############################
+  # Public
+  ###########################
+
+  @doc "Starts a genserver to keep state on the config and time diff"
+  def start_link({client, config, opts}) do
+    LoggingUtils.log_mod_func_line(__ENV__, :debug)
+    GenServer.start_link(__MODULE__, {client, config, opts}, [name: gen_server_name(client)])
+  end
+
+
+  @doc "Retrieves the ovh api time diff from the cache"
+  def get_time_diff(client) do
+    GenServer.call(gen_server_name(client), :get_diff)
+  end
+  @doc "Retrieves the ovh config map"
+  def get_config(client) do
+    GenServer.call(gen_server_name(client), :get_config)
+  end
+
+
+  ############################
+  # Genserver Callbacks
+  ###########################
+
+  def init({client, config, opts}) do
+    LoggingUtils.log_mod_func_line(__ENV__, :debug)
+    diff = calculate_diff(config)
+    {:ok, {config, diff}}
+  end
+
+  def handle_call(:get_diff, _from, {config, diff}) do
+    LoggingUtils.log_mod_func_line(__ENV__, :debug)
+    {:reply, diff, {config, diff}}
+  end
+
+  def handle_call(:get_config, _from, {config, diff}) do
+    LoggingUtils.log_mod_func_line(__ENV__, :debug)
+    {:reply, config, {config, diff}}
+  end
+
+  def handle_cast({:set_diff, new_diff}, {config, diff}) do
+    LoggingUtils.log_mod_func_line(__ENV__, :debug)
+    {:noreply, {config, new_diff}}
+  end
+
+  def terminate(:shutdown, state) do
+    LoggingUtils.log_mod_func_line(__ENV__, :warn)
+    LoggingUtils.log_return("gen_server #{__MODULE__} shutting down", :warn)
+    :ok
+  end
+
+
+  ############################
+  # Private
+  ###########################
+
+
+  defp gen_server_name(client), do: String.to_atom(Atom.to_string(client) <> Atom.to_string(__MODULE__))
+  defp endpoint(config), do: Defaults.endpoints()[config[:endpoint]]
+  defp api_version(config), do: config[:api_version]
+
+
+  defp api_time_request(config) do
+    time_uri = endpoint(config) <> api_version(config) <> "/auth/time"
+    options = %{ headers: %{ "Content-Type": "application/json; charset=utf-8" }, timeout: 10_000 }
+    api_time = HTTPotion.request(:get, time_uri, options) |> Map.get(:body) |> Poison.decode!()
+  end
+
+
+  defp calculate_diff(config) do
+    api_time = api_time_request(config)
+    os_t = :os.system_time(:seconds)
+    os_t - api_time
+  end
+
+
+  #Caches the ovh api time diff
+  defp set_time_diff(client) do
+    config = get_config(client)
+    set_time_diff(client, config)
+  end
+  defp set_time_diff(client, config) when is_map(config) do
+    diff = calculate_diff(config)
+    GenServer.cast(gen_server_name(client), {:set_diff, diff})
+  end
+
+
+end
\ No newline at end of file
diff --git a/lib/ovh/ovh_api/request.ex b/lib/ovh/ovh_api/request.ex
index 57edbb6..bc968e0 100644
--- a/lib/ovh/ovh_api/request.ex
+++ b/lib/ovh/ovh_api/request.ex
@@ -1,8 +1,7 @@
 defmodule ExOvh.Ovh.OvhApi.Request do
-  alias ExOvh.Ovh.Auth
-  alias LoggingUtils
+  alias ExOvh.Ovh.OvhApi.Auth
+  alias ExOvh.Ovh.OvhApi.Cache
   alias ExOvh.Ovh.Defaults
-  alias ExOvh.Ovh.Cache
 
   ############################
   # Public
@@ -18,7 +17,7 @@ defmodule ExOvh.Ovh.OvhApi.Request do
                :: {:ok, ExOvh.Client.response_t} | {:error, ExOvh.Client.response_t}
   def request(client, {method, uri, params} = query) do
     config = config(client)
-    {method, uri, options} = Auth.prep_request(client, query)
+    {method, uri, options} = Auth.prepare_request(client, query)
     resp = HTTPotion.request(method, uri, options)
     resp =
     %{
diff --git a/lib/ovh/supervisor.ex b/lib/ovh/supervisor.ex
index 1d4436a..66a0baf 100644
--- a/lib/ovh/supervisor.ex
+++ b/lib/ovh/supervisor.ex
@@ -3,7 +3,7 @@ defmodule ExOvh.Ovh.Supervisor do
   Supervisor for the Ovh Configuration
   """
   use Supervisor
-  alias ExOvh.Ovh.Cache
+  alias ExOvh.Ovh.OvhApi.Cache
 
   #####################
   #  Public