diff --git a/geocoder.install b/geocoder.install
new file mode 100644
index 0000000..049f144
--- /dev/null
+++ b/geocoder.install
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the Geocoder module.
+ */
+
+/**
+ * Implements hook_schema().
+ */
+function geocoder_schema() {
+  $schema['cache_geocoder'] = drupal_get_schema_unprocessed('system', 'cache');
+  $schema['cache_geocoder']['description'] = 'Cache table for the geocoder module to store geocoded locations.';
+
+  return $schema;
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function geocoder_uninstall() {
+  variable_del('geocoder_settings');
+  variable_del('geocoder_cache_empty_results');
+  variable_del('geocoder_cache_ttl');
+}
+
+/**
+ * Create geocoder's caching table.
+ */
+function geocoder_update_7101() {
+  drupal_install_schema('geocoder');
+}
diff --git a/geocoder.module b/geocoder.module
index e43d09e..41c5981 100644
--- a/geocoder.module
+++ b/geocoder.module
@@ -27,13 +27,10 @@ define('GEOCODER_GOOGLE_AUTH_WORK', 3);
  *   Additional options to pass to the handler. Exact key / values to pass depend on the handler.
  *
  * @param int $cache_type
- *   (optional) The type of caching to use. Defaults to 2 (static and persistent)
- *     0 or FALSE is no-caching at all
- *     1 is static-cache but no persistent-cache
- *     2 is both static-cache AND persistent-cache
+ *   DEPRECATED. All results are cached persistently.
  *
  * @param bool $cache_reset
- *   (optional) Empty the static-cache and re-fill the persistent-cache. Defaults to FALSE.
+ *   (optional) Ignore potentially matched cache record, and live fetch. Defaults to FALSE.
  *
  * @return Geometry
  *   Returns a geoPHP geometry object. Generally a Point.
@@ -43,26 +40,29 @@ define('GEOCODER_GOOGLE_AUTH_WORK', 3);
  *    geocoder('google','4925 Gair Ave, Terrace, BC');
  *    geocoder('google','New York City',array('geometry_type' => 'bounds'));
  */
-function geocoder($handler, $data, $options = array(), $cache_type = 2, $cache_reset = FALSE) {
+function geocoder($handler, $data, $options = array(), $cache_type = 'DEPRECATED', $cache_reset = FALSE) {
   ctools_include('plugins');
-  static $static_cache = array();
 
-  if ($cache_reset) {
-    $static_cache = array();
+  $processor = ctools_get_plugins('geocoder', 'geocoder_handler', $handler);
+  if (!$processor) {
+    return NULL;
   }
 
-  if ($cache_type) {
-    $cache_id = $handler . '_' . md5(serialize(array($data, $options)));
-    if (!empty($static_cache[$cache_id])) {
-      return $static_cache[$cache_id];
-    }
-  }
+  // Attempt to retrieve from persistent cache.
+  $geometry = $cache_reset ? NULL : geocoder_cache_get($handler, $data, $options);
 
-  $processor = ctools_get_plugins('geocoder', 'geocoder_handler', $handler);
-  $geometry = call_user_func($processor['callback'], $data, $options);
+  // No cache record, so fetch live.
+  if ($geometry === NULL) {
+    try {
+      $geometry = call_user_func($processor['callback'], $data, $options);
+    }
+    catch (Exception $e) {
+      watchdog_exception('geocoder', $e);
+      return NULL;
+    }
 
-  if ($cache_type) {
-    $static_cache[$cache_id] = $geometry;
+    // Always save result into persistent cache.
+    geocoder_cache_set($geometry, $handler, $data, $options);
   }
 
   return $geometry;
@@ -293,3 +293,61 @@ function geocoder_service_check_request($handler, $format, $check_ac = TRUE) {
     exit();
   }
 }
+
+/**
+ * Create a unified cache id from relevant cache data.
+ */
+function _geocoder_cache_cid($data) {
+  ksort($data);
+  return sha1(serialize($data));
+}
+
+/**
+ * Retrieve a cached geocoded location.
+ *
+ * @param string $handler
+ *   The handler used to geocode this data.
+ * @param mixed $data
+ *   The data used to fetch live geo data.
+ * @param array $options
+ *   Handler-specific options that have effect on the result.
+ *
+ * @return Geometry
+ *   A Geometry object, FALSE (no result), or NULL (no cache).
+ */
+function geocoder_cache_get($handler, $data, $options) {
+  $data = compact('handler', 'data', 'options');
+  $cid = _geocoder_cache_cid($data);
+
+  geophp_load();
+  if ($cache = cache_get($cid, 'cache_geocoder')) {
+    return $cache->data['geometry'];
+  }
+}
+
+/**
+ * Cache a geocoded result.
+ *
+ * @param mixed $geometry
+ *   A Geometry object, or FALSE (no result).
+ * @param string $handler
+ *   The handler used to geocode this data.
+ * @param mixed $data
+ *   The data used to fetch live geo data.
+ * @param array $options
+ *   Handler-specific options that have effect on the result.
+ */
+function geocoder_cache_set($geometry, $handler, $data, $options) {
+  // Don't cache no-results, to live geocode the same data again next time.
+  if (!$geometry && variable_get('geocoder_cache_empty_results', TRUE)) {
+    return;
+  }
+
+  // Construct the cache id from result-relevant parameters.
+  $data = compact('handler', 'data', 'options');
+  $cid = _geocoder_cache_cid($data);
+
+  // Cache result-relevant parameters together with the actual result, so cache records can be traced.
+  $data['geometry'] = $geometry ? $geometry : FALSE;
+  cache_set($cid, $data, 'cache_geocoder', variable_get('geocoder_cache_ttl', CACHE_PERMANENT));
+}
diff --git a/geocoder.widget.inc b/geocoder.widget.inc
index 0034652..519acc1 100644
--- a/geocoder.widget.inc
+++ b/geocoder.widget.inc
@@ -246,26 +246,13 @@ function geocoder_widget_get_field_value($entity_type, $field_instance, $entity
       return array();
     }
 
-    // For entities being updated, determine if another geocode is necessary
-    if ($entity) {
-      if (!empty($entity->original)) {
-        //@@TODO: Deal with entity-properties (non-fields)
-        //@@TODO: This isn't working with file fields. Should use some kind of lookup / map
-        $field_original = field_get_items($entity_type, $entity->original, $field_name, isset($entity->original->language) ? $entity->original->language : NULL);
-        $target_original = field_get_items($entity_type, $entity->original, $field_instance['field_name'], isset($entity->original->language) ? $entity->original->language : NULL);
-        if (!empty($field_original) && !empty($target_original)) {
-          $diff = geocoder_widget_array_recursive_diff($field_original, $source_field_values);
-          if (empty($diff)) {
-            return FALSE;
-          }
-        }
-      }
-    }
-
     // Get the handler-specific-settings
     if (isset($field_instance['widget']['settings']['handler_settings'][$handler['name']])) {
       $handler_settings = $field_instance['widget']['settings']['handler_settings'][$handler['name']];
     }
+    else {
+      $handler_settings = array();
+    }
 
     // Determine how we deal with deltas (multi-value fields)
     if (empty($field_instance['widget']['settings']['delta_handling'])) {
@@ -281,44 +268,44 @@ function geocoder_widget_get_field_value($entity_type, $field_instance, $entity
     }
 
     // Allow other modules to alter values before we geocode them.
-    drupal_alter('geocoder_geocode_values',
-        $source_field_values, $field_info, $handler_settings, $field_instance
-    );
+    drupal_alter('geocoder_geocode_values', $source_field_values, $field_info, $handler_settings, $field_instance);
 
     if (is_array($source_field_values) && count($source_field_values)) {
-      $values = array();
-
-      // Geocode geometries
+      // Geocode geometries.
       $geometries = array();
       foreach ($source_field_values as $delta => $item) {
-        // Geocode any value from our source field.
-        try {
-          if (isset($handler_settings)) {
+        // Attempt to retrieve from persistent cache.
+        $geometry = geocoder_cache_get($handler['name'], $item, $handler_settings);
+
+        // No cache record, so fetch live.
+        if ($geometry === NULL) {
+          // Geocode any value from our source field.
+          try {
             $geometry = call_user_func($handler['field_callback'], $field_info, $item, $handler_settings);
+
+            // Save result persistently.
+            geocoder_cache_set($geometry, $handler['name'], $item, $handler_settings);
           }
-          else {
-            $geometry = call_user_func($handler['field_callback'], $field_info, $item);
-          }
-          if ($geometry instanceof Geometry) {
-            $geometries[] = $geometry;
+          catch (Exception $e) {
+            $uri_info = entity_uri($entity_type, $entity);
+            watchdog_exception('geocoder', $e, NULL, array(), WATCHDOG_ERROR,
+              l(t('View offending entity (@entity_type: @bundle).', array(
+                '@entity_type' => $entity_info['label'],
+                '@bundle' => isset($entity->type) ? $entity->type : '',
+              )), $uri_info['path'])
+            );
+            return FALSE;
           }
         }
-        catch (Exception $e) {
-          $uri_info = entity_uri($entity_type, $entity);
-          watchdog_exception('geocoder', $e, NULL, array(), WATCHDOG_ERROR,
-            l(t('View offending entity (@entity_type: @bundle).', array(
-              '@entity_type' => $entity_info['label'],
-              '@bundle' => isset($entity->type) ? $entity->type : '',
-            )), $uri_info['path'])
-          );
-          return FALSE;
+
+        if ($geometry instanceof Geometry) {
+          $geometries[] = $geometry;
         }
       }
 
       if (empty($geometries)) {
         // This field has no data, so set the field to an empty array in
         // order to delete its saved data.
-        $values = array(NULL);
         return array();
       }
       else {
@@ -384,7 +371,7 @@ function geocoder_widget_resolve_deltas($geometries, $delta_handling = 'default'
   }
 
   // For multiple-to-single handling, run it though geometryReduce
-   if ($delta_handling == 'm_to_s' || $delta_handling == 'c_to_s') {
+  if ($delta_handling == 'm_to_s' || $delta_handling == 'c_to_s') {
     $reduced_geom = geoPHP::geometryReduce($geometries);
     $values[] = geocoder_widget_values_from_geometry($reduced_geom, $target_info);
   }
@@ -479,30 +466,3 @@ function geocoder_widget_parse_locationfield($field_item) {
 
   return $address;
 }
-
-/**
- * Helper function to compare 2 arrays recursively.
- *
- * @TODO: conform to drupal coding standards.
- */
-function geocoder_widget_array_recursive_diff($aArray1, $aArray2) {
-  $aReturn = array();
-  if (empty($aArray1)) {
-    return $aReturn;
-  }
-  foreach ($aArray1 as $mKey => $mValue) {
-    if (array_key_exists($mKey, $aArray2)) {
-      if (is_array($mValue)) {
-        $aRecursiveDiff = geocoder_widget_array_recursive_diff($mValue, $aArray2[$mKey]);
-        if (count($aRecursiveDiff)) { $aReturn[$mKey] = $aRecursiveDiff; }
-      } elseif (!empty($mValue)) {
-        if ($mValue != $aArray2[$mKey]) {
-          $aReturn[$mKey] = $mValue;
-        }
-      }
-    } elseif (!empty($mValue)) {
-      $aReturn[$mKey] = $mValue;
-    }
-  }
-  return $aReturn;
-}