diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 7e96e8aab15a9105c6d8af0ddfa9cf6478973f53..4128a01ee57e786cb3792c0eaa771dd72fbce285 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -57,8 +57,6 @@ module Geocoder
       :units,
       :distances,
       :basic_auth,
-      :for_storage,
-      :token,
       :logger,
       :kernel_logger_level
     ]
@@ -102,8 +100,6 @@ module Geocoder
       @data[:cache]        = nil         # cache object (must respond to #[], #[]=, and #keys)
       @data[:cache_prefix] = "geocoder:" # prefix (string) to use for all cache keys
       @data[:basic_auth]   = {}          # user and password for basic auth ({:user => "user", :password => "password"})
-      @data[:for_storage]  = nil         # will the result be stored for non-caching purposes (boolean)
-      @data[:token]  = nil               # token object for authentication
       @data[:logger]       = :kernel     # :kernel or Logger instance
       @data[:kernel_logger_level] = ::Logger::WARN # log level, if kernel logger is used
 
diff --git a/lib/geocoder/lookups/esri.rb b/lib/geocoder/lookups/esri.rb
index 364283b72aa73d7f9a68def17c21db9cdd121cbf..122c8c8b368825d1949ce6dbc8a5468faba52192 100644
--- a/lib/geocoder/lookups/esri.rb
+++ b/lib/geocoder/lookups/esri.rb
@@ -43,13 +43,13 @@ module Geocoder::Lookup
         params[:text] = query.sanitized_text
       end
       params[:token] = token
-      params[:forStorage] = configuration.for_storage if configuration.for_storage
+      params[:forStorage] = configuration[:for_storage] if configuration[:for_storage]
       params.merge(super)
     end
 
     def token
-      if configuration.token && configuration.token.active? # if we have a token, use it
-        configuration.token.to_s
+      if configuration[:token] && configuration[:token].active? # if we have a token, use it
+        configuration[:token].to_s
       elsif configuration.api_key # generate a new token if we have credentials
         token_instance = EsriToken.generate_token(*configuration.api_key)
         Geocoder.configure(:esri => {:token => token_instance})