diff --git a/core/DeviceDetectorFactory.php b/core/DeviceDetectorFactory.php
index 2217dbe7c0..bfef8aeae2 100644
--- a/core/DeviceDetectorFactory.php
+++ b/core/DeviceDetectorFactory.php
@@ -11,10 +11,44 @@ namespace Piwik;
 use DeviceDetector\DeviceDetector;
 use Piwik\Common;
 
+class DeviceDetectorCache extends DeviceDetector {
+
+    private $cachedAgents = array();
+
+    public function __construct(){
+        // load this list from a file, eg in misc/useragents.php
+        // we need a command to generate / update this list from a list of user agents
+        // on cloud we have like say 2000 user agents...
+        // another option maybe one file per user agent misc/useragents/$(md5(userAgent)).php which we could use
+        // if the cache file gets big for 1000 user agents...
+        $this->cachedAgents = array(
+            'the user agent...' => array('bot' => null, 'client' => '', ''),
+            'another user agent...' => array('bot' => null, 'client' => '')
+        );
+    }
+
+    public function isCached()
+    {
+        return !empty($this->cachedAgents[$this->userAgent]);
+    }
+
+    public function parse()
+    {
+        $this->bot = $this->cachedAgents[$this->userAgent]['bot'];
+        $this->client = $this->cachedAgents[$this->userAgent]['client'];
+        $this->device = $this->cachedAgents[$this->userAgent]['device'];
+        $this->model = $this->cachedAgents[$this->userAgent]['model'];
+        $this->brand = $this->cachedAgents[$this->userAgent]['brand'];
+        $this->os = $this->cachedAgents[$this->userAgent]['os'];
+    }
+}
+
 class DeviceDetectorFactory
 {
     protected static $deviceDetectorInstances = array();
 
+    private static $cache = null;
+
     /**
      * Returns a Singleton instance of DeviceDetector for the given user agent
      * @param string $userAgent
@@ -28,10 +62,19 @@ class DeviceDetectorFactory
             return self::$deviceDetectorInstances[$userAgent];
         }
 
+        $cache = new DeviceDetectorCache($userAgent);
+        if ($cache->isCached()) {
+            self::$deviceDetectorInstances[$userAgent] = $cache;
+            return $cache;
+        }
+
         $deviceDetector = new DeviceDetector($userAgent);
         $deviceDetector->discardBotInformation();
         $deviceDetector->setCache(new DeviceDetectorCache(86400));
         $deviceDetector->parse();
+        
+        // in the command ...
+        // $cached[$userAgent] = array('isBot' => $deviceDetector->isBot(), 'client' => $deviceDetector->getClient());
 
         self::$deviceDetectorInstances[$userAgent] = $deviceDetector;