diff --git a/ds.module b/ds.module
index 9bd77f6..5b4de04 100644
--- a/ds.module
+++ b/ds.module
@@ -581,7 +581,7 @@ function ds_get_fields($entity_type, $cache = TRUE) {
   // Get fields from cache.
   if (!$loaded) {
     $loaded = TRUE;
-    if ($cache && $cached_fields = cache_get('ds_fields')) {
+    if ($cache && $cached_fields = cache_get('ds_fields:' . $GLOBALS[LANGUAGE_TYPE_CONTENT]->language)) {
       $fields_cached = $static_fields = $cached_fields->data;
     }
   }
@@ -616,7 +616,7 @@ function ds_get_fields($entity_type, $cache = TRUE) {
 
       // Cache the fields.
       if ($cache) {
-        cache_set('ds_fields', $fields_cached, 'cache');
+        cache_set('ds_fields:' . $GLOBALS[LANGUAGE_TYPE_CONTENT]->language, $fields_cached, 'cache');
       }
     }
     else {