diff --git a/commerce_usps.module b/commerce_usps.module
index 0f0a264..245c90d 100644
--- a/commerce_usps.module
+++ b/commerce_usps.module
@@ -82,17 +82,12 @@ function commerce_usps_form_alter(&$form, &$form_state, $form_id) {
  * calculated for the given order.
  */
 function commerce_usps_rate($service, $order) {
-  // Attempt to recover cached shipping rates.
-  // @todo: Allow the setting of commerce_usps_rates_timeout.
-  $rates = commerce_shipping_rates_cache_get('usps', $order, variable_get('commerce_usps_rates_timeout', 0));
-  // If no cached rates were found or they have expired.
-  if (!$rates) {
     // Load files required for building requests.
     module_load_include('inc', 'commerce_usps', 'commerce_usps.xml');
     $rates = array();
 
     // Build the request.
-    $request = commerce_usps_build_rate_request($order);
+    $request = commerce_usps_build_rate_request($service, $order);
 
     if ($request) {
       // Submit the request.
@@ -128,7 +123,6 @@ function commerce_usps_rate($service, $order) {
         watchdog('usps', 'Number:@number<br />Description:@description<br />Source:@source', array('@number' => $response->Number->asXML(), '@description' => $response->Description->asXML(), '@source' => $response->Source->asXML()), WATCHDOG_ERROR);
       }
     }
-  }
 
   // Return the rate for the requested service or FALSE if not found.
   return isset($rates[$service['name']]) ? $rates[$service['name']] : FALSE;
diff --git a/commerce_usps.xml.inc b/commerce_usps.xml.inc
index c18ebbc..f7fe1b0 100644
--- a/commerce_usps.xml.inc
+++ b/commerce_usps.xml.inc
@@ -8,7 +8,7 @@
 /**
  * Builds the USPS rate request.
  */
-function commerce_usps_build_rate_request($order) {
+function commerce_usps_build_rate_request($service, $order) {
   $order_wrapper = entity_metadata_wrapper('commerce_order', $order);
 
   // Determine the shipping profile reference field name for the order.
@@ -37,23 +37,17 @@ function commerce_usps_build_rate_request($order) {
   $request = new SimpleXMLElement('<RateV4Request/>');
   $request->addAttribute('USERID', variable_get('commerce_usps_user', ''));
 
-  // Add a package to the request for each enabled service.
-  $i = 1;
-  foreach (variable_get('commerce_usps_services', array()) as $service) {
     if ($service) {
       $package = $request->addChild('Package');
-      $package->addAttribute('ID', $i);
-      $package->addChild('Service', $service);
+      $package->addAttribute('ID', 1);
+      $package->addChild('Service', $service['title']);
       $package->addChild('ZipOrigination', variable_get('commerce_usps_postal_code', ''));
       $package->addChild('ZipDestination', $shipping_address['postal_code']);
       $package->addChild('Pounds', $pounds);
       $package->addChild('Ounces', $ounces);
       $package->addChild('Container', 'VARIABLE');
       $package->addChild('Size', 'REGULAR');
-
-      ++$i;
     }
-  }
 
   return 'API=RateV4&XML=' . $request->asXML();
 }