diff --git a/cloud/ec2.py b/cloud/ec2.py
index 6d2bae6a64dec617422f2acfc48253e10a865a61..165806592ec0a1be80506cd13a40c0f1c8e1977c 100755
--- a/cloud/ec2.py
+++ b/cloud/ec2.py
@@ -317,9 +317,11 @@ class Ec2Inventory(object):
             cache_dir = os.path.join(cache_dir, 'profile_' + self.boto_profile)
         if not os.path.exists(cache_dir):
             os.makedirs(cache_dir)
-
-        self.cache_path_cache = cache_dir + "/ansible-ec2.cache"
-        self.cache_path_index = cache_dir + "/ansible-ec2.index"
+        suffix = ''
+        if 'ANSIBLE_COMPANY' in os.environ:
+            suffix = '-' + os.environ['ANSIBLE_COMPANY']
+        self.cache_path_cache = cache_dir + "/ansible-ec2" + suffix + ".cache"
+        self.cache_path_index = cache_dir + "/ansible-ec2" + suffix + ".index"
         self.cache_max_age = config.getint('ec2', 'cache_max_age')
 
         if config.has_option('ec2', 'expand_csv_tags'):
diff --git a/cloud/jiffybox.py b/cloud/jiffybox.py
index 152583ac6b55edf9b9133c31edd00fcdf5af0a0c..c82203130e63c1ec65321901dc40402fc0a72537 100755
--- a/cloud/jiffybox.py
+++ b/cloud/jiffybox.py
@@ -130,9 +130,11 @@ class JiffyBoxInventory(object):
         cache_dir = os.path.expanduser(config.get('jiffybox', 'cache_path'))
         if not os.path.exists(cache_dir):
             os.makedirs(cache_dir)
-
-        self.cache_path_cache = cache_dir + "/ansible-jiffybox.cache"
-        self.cache_path_index = cache_dir + "/ansible-jiffybox.index"
+        suffix = ''
+        if 'ANSIBLE_COMPANY' in os.environ:
+            suffix = '-' + os.environ['ANSIBLE_COMPANY']
+        self.cache_path_cache = cache_dir + "/ansible-jiffybox" + suffix + ".cache"
+        self.cache_path_index = cache_dir + "/ansible-jiffybox" + suffix + ".index"
         self.cache_max_age = config.getint('jiffybox', 'cache_max_age')
 
         # Do we need to just include hosts that match a pattern?