diff --git a/entitycache.info b/entitycache.info
index 2231cc7..10d5534 100644
--- a/entitycache.info
+++ b/entitycache.info
@@ -1,8 +1,8 @@
 name = Entity cache
 description = Provides caching for core entities including nodes and taxonomy terms.
-
-core = 7.x
 package = Performance and scalability
+core = 7.x
+php = 5.3
 
 files[] = includes/entitycache.entitycachecontrollerhelper.inc
 files[] = includes/entitycache.comment.inc
diff --git a/includes/entitycache.entitycachecontrollerhelper.inc b/includes/entitycache.entitycachecontrollerhelper.inc
index af1476d..f441695 100644
--- a/includes/entitycache.entitycachecontrollerhelper.inc
+++ b/includes/entitycache.entitycachecontrollerhelper.inc
@@ -51,6 +51,8 @@ class EntityCacheControllerHelper extends DrupalDefaultEntityController {
    *   An array of loaded entities keyed by ID.
    */
   public static function entityCacheLoad($controller, $ids = array(), $conditions = array()) {
+    // @todo Convert this to static::method() for Drupal 8.
+    $class = get_called_class();
     $entities = array();
     $cached_entities = array();
     $queried_entities = array();
@@ -93,9 +95,9 @@ class EntityCacheControllerHelper extends DrupalDefaultEntityController {
       if (isset($result[$controller->entityType])) {
         $entity_ids = array_keys($result[$controller->entityType]);
         if ($revision_id) {
-          return static::entityCacheLoad($controller, $entity_ids, array($controller->revisionKey => $revision_id));
+          return $class::entityCacheLoad($controller, $entity_ids, array($controller->revisionKey => $revision_id));
         } else {
-          return static::entityCacheLoad($controller, $entity_ids);
+          return $class::entityCacheLoad($controller, $entity_ids);
         }
       }
       else {
@@ -129,7 +131,7 @@ class EntityCacheControllerHelper extends DrupalDefaultEntityController {
 
     // Ensure integer entity IDs are valid.
     if (!empty($ids)) {
-      static::entityCacheCleanIds($controller, $ids);
+      $class::entityCacheCleanIds($controller, $ids);
     }
 
     // Load any remaining entities from the database. This is the case if $ids