Index: libraries.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/libraries/libraries.module,v
retrieving revision 1.6
diff -u -p -r1.6 libraries.module
--- libraries.module	23 Jul 2010 12:57:01 -0000	1.6
+++ libraries.module	25 Jul 2010 20:01:38 -0000
@@ -187,7 +187,7 @@ function libraries_info($library = NULL)
  * @see libraries_info()
  */
 function libraries_detect($libraries) {
-  foreach ($libraries as &$library) {
+  foreach ($libraries as $name => &$library) {
     libraries_detect_library($library);
   }
   return $libraries;
@@ -278,19 +278,28 @@ function libraries_detect_library(&$libr
 
   // If we end up here, the library should be usable.
   $library['installed'] = TRUE;
+
+  // Update the cache.
+  cache_set('libraries_' . $name, $library);
 }
 
 /**
  * Loads a library.
  *
- * @param $library
+ * @param $name
  *   The name of the library to load.
  * @param $variant
  *   The name of the variant to load.
  */
-function libraries_load($library, $variant = NULL) {
-  $library = libraries_info($library);
-  libraries_detect_library($library);
+function libraries_load($name, $variant = NULL) {
+  $library = cache_get('libraries_' . $name);
+  if (empty($library)) {
+    $library = libraries_info($name);
+    libraries_detect_library($library);
+  }
+  else {
+    $library = $library->data;
+  }
   libraries_load_files($library, $variant);
 }