diff --git a/acquia_search/acquia_search.install b/acquia_search/acquia_search.install
index 1d899bc..2c64213 100644
--- a/acquia_search/acquia_search.install
+++ b/acquia_search/acquia_search.install
@@ -50,6 +50,10 @@ function acquia_search_requirements($phase) {
       $requirements['acquia_search_apachesolr']['value'] = $t('Incompatible API version');
     }
   }
+  // Update the cached version whenever we may be updating the module.
+  if ($phase == 'runtime' || $phase == 'update') {
+    _acquia_search_set_version();
+  }
 
   return $requirements;
 }
diff --git a/acquia_search/acquia_search.module b/acquia_search/acquia_search.module
index 4d8a415..dd5f741 100644
--- a/acquia_search/acquia_search.module
+++ b/acquia_search/acquia_search.module
@@ -54,11 +54,11 @@ function acquia_search_get_environment($conf = array()) {
  * Implementation of hook_enable().
  */
 function acquia_search_enable() {
-  if (acquia_agent_subscription_is_active()) {
-    acquia_search_enable_acquia_solr_environment();
-    // Send a heartbeat so the Acquia Network knows the module is enabled.
-    acquia_agent_check_subscription();
-  }
+  // Send a heartbeat so the Acquia Network knows the module is enabled.
+  // This causes an invocation of hook_acquia_subscription_status() which is
+  // implemented in this module to set up the environment.
+  _acquia_search_set_version();
+  acquia_agent_check_subscription();
 }
 
 /**
@@ -138,10 +138,10 @@ function acquia_search_menu_alter(&$menu) {
 }
 
 /**
- * Implementation of hook_cron().
+ * Helper function to cache the Acquia Search version.
  */
-function acquia_search_cron() {
-  // Cache the cersion in a variable so we can send it at not extra cost.
+function _acquia_search_set_version() {
+  // Cache the version in a variable so we can send it at not extra cost.
   $version = variable_get('acquia_search_version', '7.x');
   $info = system_get_info('module', 'acquia_search');
   // Send the version, or at least the core compatibility as a fallback.
@@ -149,9 +149,6 @@ function acquia_search_cron() {
   if ($version != $new_version) {
     variable_set('acquia_search_version', $new_version);
   }
-  // Add the environment if it wasn't added before
-  acquia_search_enable();
-
 }
 
 /**