diff --git a/src/Pattern/CallbackCache.php b/src/Pattern/CallbackCache.php
index e5fe0b0fd..fe26293d7 100644
--- a/src/Pattern/CallbackCache.php
+++ b/src/Pattern/CallbackCache.php
@@ -44,7 +44,8 @@ public function setOptions(PatternOptions $options)
      * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return mixed Result
-     * @throws Exception
+     * @throws Exception\RuntimeException if invalid cached data
+     * @throws \Exception
      */
     public function call($callback, array $args = array())
     {
@@ -100,7 +101,8 @@ public function call($callback, array $args = array())
      * @param  string $function  Function name to call
      * @param  array  $args      Function arguments
      * @return mixed
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws \Exception
      */
     public function __call($function, array $args)
     {
@@ -114,7 +116,8 @@ public function __call($function, array $args)
      * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws Exception\InvalidArgumentException
      */
     public function generateKey($callback, array $args = array())
     {
@@ -127,8 +130,9 @@ public function generateKey($callback, array $args = array())
      *
      * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
+     * @throws Exception\RuntimeException if callback not serializable
+     * @throws Exception\InvalidArgumentException if invalid callback
      * @return string
-     * @throws Exception
      */
     protected function generateCallbackKey($callback, array $args)
     {
@@ -173,8 +177,8 @@ protected function generateCallbackKey($callback, array $args)
      * Generate a unique key of the argument part.
      *
      * @param  array $args
+     * @throws Exception\RuntimeException
      * @return string
-     * @throws Exception
      */
     protected function generateArgumentsKey(array $args)
     {
diff --git a/src/Pattern/CaptureCache.php b/src/Pattern/CaptureCache.php
index b8b2fbce6..1d51337cc 100644
--- a/src/Pattern/CaptureCache.php
+++ b/src/Pattern/CaptureCache.php
@@ -49,7 +49,7 @@ public function start($pageId = null)
      *
      * @param string      $content
      * @param null|string $pageId
-     * @throws Exception\RuntimeException
+     * @throws Exception\LogicException
      */
     public function set($content, $pageId = null)
     {
@@ -74,6 +74,7 @@ public function set($content, $pageId = null)
      *
      * @param  null|string $pageId
      * @return bool|string
+     * @throws Exception\LogicException
      * @throws Exception\RuntimeException
      */
     public function get($pageId = null)
@@ -108,6 +109,7 @@ public function get($pageId = null)
      * Checks if a cache with given id exists
      *
      * @param  null|string $pageId
+     * @throws Exception\LogicException
      * @return boolean
      */
     public function has($pageId = null)
@@ -132,6 +134,7 @@ public function has($pageId = null)
      * Remove from cache
      *
      * @param  null|string $pageId
+     * @throws Exception\LogicException
      * @throws Exception\RuntimeException
      * @return boolean
      */
@@ -169,6 +172,7 @@ public function remove($pageId = null)
      * Clear cached pages matching glob pattern
      *
      * @param string $pattern
+     * @throws Exception\LogicException
      */
     public function clearByGlob($pattern = '**')
     {
@@ -191,6 +195,7 @@ public function clearByGlob($pattern = '**')
     /**
      * Determine the page to save from the request
      *
+     * @throws Exception\RuntimeException
      * @return string
      */
     protected function detectPageId()
diff --git a/src/Pattern/ClassCache.php b/src/Pattern/ClassCache.php
index 6bd7fbee9..3935c0088 100644
--- a/src/Pattern/ClassCache.php
+++ b/src/Pattern/ClassCache.php
@@ -44,7 +44,8 @@ public function setOptions(PatternOptions $options)
      * @param  string $method  Method name to call
      * @param  array  $args    Method arguments
      * @return mixed
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws \Exception
      */
     public function call($method, array $args = array())
     {
@@ -78,7 +79,7 @@ public function call($method, array $args = array())
      * @param  string     $method  The method
      * @param  array      $args    Callback arguments
      * @return string
-     * @throws Exception
+     * @throws Exception\RuntimeException
      */
     public function generateKey($method, array $args = array())
     {
@@ -95,7 +96,7 @@ public function generateKey($method, array $args = array())
      * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
-     * @throws Exception
+     * @throws Exception\RuntimeException
      */
     protected function generateCallbackKey($callback, array $args)
     {
@@ -110,7 +111,8 @@ protected function generateCallbackKey($callback, array $args)
      * @param  string $method  Method name to call
      * @param  array  $args    Method arguments
      * @return mixed
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws \Exception
      */
     public function __call($method, array $args)
     {
diff --git a/src/Pattern/ObjectCache.php b/src/Pattern/ObjectCache.php
index e8ab316a7..bff731f50 100644
--- a/src/Pattern/ObjectCache.php
+++ b/src/Pattern/ObjectCache.php
@@ -43,7 +43,8 @@ public function setOptions(PatternOptions $options)
      * @param  string $method  Method name to call
      * @param  array  $args    Method arguments
      * @return mixed
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws \Exception
      */
     public function call($method, array $args = array())
     {
@@ -158,7 +159,7 @@ public function call($method, array $args = array())
      * @param  string     $method  The method
      * @param  array      $args    Callback arguments
      * @return string
-     * @throws Exception
+     * @throws Exception\RuntimeException
      */
     public function generateKey($method, array $args = array())
     {
@@ -175,7 +176,7 @@ public function generateKey($method, array $args = array())
      * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
-     * @throws Exception
+     * @throws Exception\RuntimeException
      */
     protected function generateCallbackKey($callback, array $args = array())
     {
@@ -190,7 +191,8 @@ protected function generateCallbackKey($callback, array $args = array())
      * @param  string $method  Method name to call
      * @param  array  $args    Method arguments
      * @return mixed
-     * @throws Exception
+     * @throws Exception\RuntimeException
+     * @throws \Exception
      */
     public function __call($method, array $args)
     {
diff --git a/src/Pattern/OutputCache.php b/src/Pattern/OutputCache.php
index a55f09cf4..f9aac0a77 100644
--- a/src/Pattern/OutputCache.php
+++ b/src/Pattern/OutputCache.php
@@ -50,8 +50,8 @@ public function setOptions(PatternOptions $options)
      * else start buffering output until end() is called or the script ends.
      *
      * @param  string  $key Key
+     * @throws Exception\MissingKeyException if key is missing
      * @return boolean
-     * @throws Exception
      */
     public function start($key)
     {
@@ -76,8 +76,8 @@ public function start($key)
      * Stops buffering output, write buffered data to cache using the given key on start()
      * and displays the buffer.
      *
+     * @throws Exception\RuntimeException if output cache not started or buffering not active
      * @return boolean TRUE on success, FALSE on failure writing to cache
-     * @throws Exception
      */
     public function end()
     {
diff --git a/src/Pattern/PatternInterface.php b/src/Pattern/PatternInterface.php
index 934ccbc53..af39a1e67 100644
--- a/src/Pattern/PatternInterface.php
+++ b/src/Pattern/PatternInterface.php
@@ -21,7 +21,7 @@ interface PatternInterface
      * Set pattern options
      *
      * @param  PatternOptions $options
-     * @return Pattern
+     * @return PatternInterface
      */
     public function setOptions(PatternOptions $options);
 
diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
index 9478f1e81..02b03ff70 100644
--- a/src/Pattern/PatternOptions.php
+++ b/src/Pattern/PatternOptions.php
@@ -10,6 +10,7 @@
 
 namespace Zend\Cache\Pattern;
 
+use Traversable;
 use Zend\Cache\Exception;
 use Zend\Cache\StorageFactory;
 use Zend\Cache\Storage\StorageInterface as Storage;
@@ -151,7 +152,7 @@ class PatternOptions extends AbstractOptions
      * Constructor
      *
      * @param  array|Traversable|null $options
-     * @return AbstractOptions
+     * @return PatternOptions
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
@@ -234,6 +235,7 @@ public function getCacheOutput()
      * - ClassCache
      *
      * @param  string $class
+     * @throws Exception\InvalidArgumentException
      * @return PatternOptions
      */
     public function setClass($class)
@@ -318,6 +320,7 @@ public function getClassNonCacheMethods()
      * Set directory permission
      *
      * @param  false|int $dirPermission
+     * @throws Exception\InvalidArgumentException
      * @return PatternOptions
      */
     public function setDirPermission($dirPermission)
@@ -358,6 +361,7 @@ public function getDirPermission()
      * - CaptureCache
      *
      * @param  false|int $umask
+     * @throws Exception\InvalidArgumentException
      * @return PatternOptions
      */
     public function setUmask($umask)
@@ -429,6 +433,7 @@ public function getFileLocking()
      * Set file permission
      *
      * @param  false|int $filePermission
+     * @throws Exception\InvalidArgumentException
      * @return PatternOptions
      */
     public function setFilePermission($filePermission)
@@ -491,7 +496,8 @@ public function getIndexFilename()
     /**
      * Set object to cache
      *
-     * @param  mixed $value
+     * @param  mixed $object
+     * @throws Exception\InvalidArgumentException
      * @return $this
      */
     public function setObject($object)
@@ -574,7 +580,7 @@ public function getObjectCacheMethods()
      * Used by:
      * - ObjectCache
      *
-     * @param  mixed $value
+     * @param  mixed $objectKey
      * @return $this
      */
     public function setObjectKey($objectKey)
@@ -633,6 +639,7 @@ public function getObjectNonCacheMethods()
      * - CaptureCache
      *
      * @param  string $publicDir
+     * @throws Exception\InvalidArgumentException
      * @return PatternOptions
      */
     public function setPublicDir($publicDir)
@@ -742,7 +749,8 @@ protected function normalizeObjectMethods(array $methods)
      * Create a storage object from a given specification
      *
      * @param  array|string|Storage $storage
-     * @return StorageAdapter
+     * @throws Exception\InvalidArgumentException
+     * @return Storage
      */
     protected function storageFactory($storage)
     {
diff --git a/src/PatternFactory.php b/src/PatternFactory.php
index b39efc9fe..5a9de1bc9 100644
--- a/src/PatternFactory.php
+++ b/src/PatternFactory.php
@@ -32,7 +32,7 @@ class PatternFactory
      * @param  string|Pattern\PatternInterface $patternName
      * @param  array|Traversable|Pattern\PatternOptions $options
      * @return Pattern\PatternInterface
-     * @throws Exception\RuntimeException
+     * @throws Exception\InvalidArgumentException
      */
     public static function factory($patternName, $options = array())
     {
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
index f78755110..61a950042 100644
--- a/src/Storage/Adapter/AbstractAdapter.php
+++ b/src/Storage/Adapter/AbstractAdapter.php
@@ -22,6 +22,7 @@
 use Zend\Cache\Storage\PostEvent;
 use Zend\Cache\Storage\StorageInterface;
 use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\EventsCapableInterface;
 
 /**
@@ -537,7 +538,7 @@ public function hasItems(array $keys)
     /**
      * Internal method to test multiple items.
      *
-     * @param  array $keys
+     * @param  array $normalizedKeys
      * @return array Array of found keys
      * @throws Exception\ExceptionInterface
      */
@@ -749,7 +750,6 @@ public function setItems(array $keyValuePairs)
      * Internal method to store multiple items.
      *
      * @param  array $normalizedKeyValuePairs
-     * @param  array $normalizedOptions
      * @return array Array of not stored keys
      * @throws Exception\ExceptionInterface
      */
@@ -1233,7 +1233,7 @@ public function removeItems(array $keys)
     /**
      * Internal method to remove multiple items.
      *
-     * @param  array $keys
+     * @param  array $normalizedKeys
      * @return array Array of not removed keys
      * @throws Exception\ExceptionInterface
      */
diff --git a/src/Storage/Adapter/AbstractZendServer.php b/src/Storage/Adapter/AbstractZendServer.php
index b18991add..d5d9ffc92 100644
--- a/src/Storage/Adapter/AbstractZendServer.php
+++ b/src/Storage/Adapter/AbstractZendServer.php
@@ -87,7 +87,6 @@ protected function internalGetItems(array & $normalizedKeys)
      * Internal method to test if an item exists.
      *
      * @param  string $normalizedKey
-     * @param  array  $normalizedOptions
      * @return boolean
      * @throws Exception\ExceptionInterface
      */
@@ -101,7 +100,7 @@ protected function internalHasItem(& $normalizedKey)
     /**
      * Internal method to test multiple items.
      *
-     * @param  array $keys
+     * @param  array $normalizedKeys
      * @return array Array of found keys
      * @throws Exception\ExceptionInterface
      */
diff --git a/src/Storage/Adapter/AdapterOptions.php b/src/Storage/Adapter/AdapterOptions.php
index 70adb9d5b..f5c0896b4 100644
--- a/src/Storage/Adapter/AdapterOptions.php
+++ b/src/Storage/Adapter/AdapterOptions.php
@@ -86,6 +86,7 @@ public function setAdapter(StorageInterface $adapter = null)
      * Set key pattern
      *
      * @param  null|string $keyPattern
+     * @throws Exception\InvalidArgumentException
      * @return AdapterOptions
      */
     public function setKeyPattern($keyPattern)
diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
index 3785ecb4a..b380672f4 100644
--- a/src/Storage/Adapter/Apc.php
+++ b/src/Storage/Adapter/Apc.php
@@ -166,7 +166,7 @@ public function flush()
     /**
      * Remove items by given namespace
      *
-     * @param string $prefix
+     * @param string $namespace
      * @return boolean
      */
     public function clearByNamespace($namespace)
@@ -265,7 +265,7 @@ protected function internalHasItem(& $normalizedKey)
     /**
      * Internal method to test multiple items.
      *
-     * @param  array $keys
+     * @param  array $normalizedKeys
      * @return array Array of found keys
      * @throws Exception\ExceptionInterface
      */
@@ -523,7 +523,7 @@ protected function internalRemoveItem(& $normalizedKey)
     /**
      * Internal method to remove multiple items.
      *
-     * @param  array $keys
+     * @param  array $normalizedKeys
      * @return array Array of not removed keys
      * @throws Exception\ExceptionInterface
      */
diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
index a85ac19a8..ef4f2cee8 100644
--- a/src/Storage/Adapter/Dba.php
+++ b/src/Storage/Adapter/Dba.php
@@ -11,6 +11,7 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use stdClass;
+use Traversable;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
@@ -209,7 +210,7 @@ public function flush()
     /**
      * Remove items by given namespace
      *
-     * @param string $prefix
+     * @param string $namespace
      * @return boolean
      */
     public function clearByNamespace($namespace)
diff --git a/src/Storage/Adapter/DbaOptions.php b/src/Storage/Adapter/DbaOptions.php
index bcf78379a..5fe3340c2 100644
--- a/src/Storage/Adapter/DbaOptions.php
+++ b/src/Storage/Adapter/DbaOptions.php
@@ -99,7 +99,7 @@ public function getPathname()
     /**
      *
      *
-     * @param unknown_type $mode
+     * @param string $mode
      * @return \Zend\Cache\Storage\Adapter\DbaOptions
      */
     public function setMode($mode)
diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
index 505cf84a1..4454c7d05 100644
--- a/src/Storage/Adapter/Filesystem.php
+++ b/src/Storage/Adapter/Filesystem.php
@@ -103,6 +103,7 @@ public function getOptions()
     /**
      * Flush the whole storage
      *
+     * @throws Exception\RuntimeException
      * @return boolean
      */
     public function flush()
@@ -179,6 +180,7 @@ public function clearExpired()
      * Remove items by given namespace
      *
      * @param string $namespace
+     * @throws Exception\RuntimeException
      * @return boolean
      */
     public function clearByNamespace($namespace)
@@ -212,6 +214,7 @@ public function clearByNamespace($namespace)
      * Remove items matching given prefix
      *
      * @param string $prefix
+     * @throws Exception\RuntimeException
      * @return boolean
      */
     public function clearByPrefix($prefix)
@@ -383,6 +386,7 @@ public function optimize()
     /**
      * Get total space in bytes
      *
+     * @throws Exception\RuntimeException
      * @return int|float
      */
     public function getTotalSpace()
@@ -419,6 +423,7 @@ public function getTotalSpace()
     /**
      * Get available space in bytes
      *
+     * @throws Exception\RuntimeException
      * @return int|float
      */
     public function getAvailableSpace()
@@ -610,7 +615,6 @@ public function hasItems(array $keys)
      * Internal method to test if an item exists.
      *
      * @param  string $normalizedKey
-     * @param  array  $normalizedOptions
      * @return boolean
      * @throws Exception\ExceptionInterface
      */
@@ -660,6 +664,7 @@ public function getMetadata($key)
      * Get metadatas
      *
      * @param array $keys
+     * @param array $options
      * @return array Associative array of keys and metadata
      */
     public function getMetadatas(array $keys, array $options = array())
@@ -1027,7 +1032,7 @@ public function touchItems(array $keys)
     /**
      * Internal method to reset lifetime of an item
      *
-     * @param  string $key
+     * @param  string $normalizedKey
      * @return boolean
      * @throws Exception\ExceptionInterface
      */
diff --git a/src/Storage/Adapter/FilesystemIterator.php b/src/Storage/Adapter/FilesystemIterator.php
index 142b680f2..b138b2d4b 100644
--- a/src/Storage/Adapter/FilesystemIterator.php
+++ b/src/Storage/Adapter/FilesystemIterator.php
@@ -74,7 +74,7 @@ public function __construct(Filesystem $storage, $path, $prefix)
     /**
      * Get storage instance
      *
-     * @return StorageInterface
+     * @return Filesystem
      */
     public function getStorage()
     {
diff --git a/src/Storage/Adapter/FilesystemOptions.php b/src/Storage/Adapter/FilesystemOptions.php
index 1914561c8..bc472f92c 100644
--- a/src/Storage/Adapter/FilesystemOptions.php
+++ b/src/Storage/Adapter/FilesystemOptions.php
@@ -10,6 +10,7 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
+use Traversable;
 use Zend\Cache\Exception;
 
 /**
@@ -106,7 +107,7 @@ class FilesystemOptions extends AdapterOptions
      * Constructor
      *
      * @param  array|Traversable|null $options
-     * @return AbstractOptions
+     * @return FilesystemOptions
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
index cbd77d8c8..d0f5a955b 100644
--- a/src/Storage/Adapter/Memcached.php
+++ b/src/Storage/Adapter/Memcached.php
@@ -17,7 +17,6 @@
 use Traversable;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\AvailableSpaceCapableInterface;
-use Zend\Cache\Storage\CallbackEvent;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\Event;
 use Zend\Cache\Storage\FlushableInterface;
diff --git a/src/Storage/Adapter/MemcachedOptions.php b/src/Storage/Adapter/MemcachedOptions.php
index 89c627786..8f0d3418e 100644
--- a/src/Storage/Adapter/MemcachedOptions.php
+++ b/src/Storage/Adapter/MemcachedOptions.php
@@ -176,6 +176,7 @@ public function getLibOptions()
     /**
      * Get libmemcached option
      *
+     * @param string|int $key
      * @return mixed
      * @link http://php.net/manual/memcached.constants.php
      */
diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
index a779f735e..ba462e717 100644
--- a/src/Storage/Adapter/Memory.php
+++ b/src/Storage/Adapter/Memory.php
@@ -115,7 +115,7 @@ public function getAvailableSpace()
     /**
      * Get the storage iterator
      *
-     * @return MemoryIterator
+     * @return KeyListIterator
      */
     public function getIterator()
     {
@@ -346,9 +346,7 @@ protected function internalGetItems(array & $normalizedKeys)
      * Internal method to test if an item exists.
      *
      * @param  string $normalizedKey
-     * @param  array  $normalizedOptions
      * @return boolean
-     * @throws Exception\ExceptionInterface
      */
     protected function internalHasItem(& $normalizedKey)
     {
@@ -370,9 +368,8 @@ protected function internalHasItem(& $normalizedKey)
     /**
      * Internal method to test multiple items.
      *
-     * @param  array $keys
+     * @param array $normalizedKeys
      * @return array Array of found keys
-     * @throws Exception\ExceptionInterface
      */
     protected function internalHasItems(array & $normalizedKeys)
     {
diff --git a/src/Storage/Adapter/MemoryOptions.php b/src/Storage/Adapter/MemoryOptions.php
index ce871fc12..21bb4cc9f 100644
--- a/src/Storage/Adapter/MemoryOptions.php
+++ b/src/Storage/Adapter/MemoryOptions.php
@@ -80,6 +80,7 @@ public function getMemoryLimit()
      * Normalized a given value of memory limit into the number of bytes
      *
      * @param string|int $value
+     * @throws Exception\InvalidArgumentException
      * @return int
      */
     protected function normalizeMemoryLimit($value)
diff --git a/src/Storage/Adapter/WinCache.php b/src/Storage/Adapter/WinCache.php
index aa78b4c1c..bfe8bf9af 100644
--- a/src/Storage/Adapter/WinCache.php
+++ b/src/Storage/Adapter/WinCache.php
@@ -12,6 +12,7 @@
 
 use ArrayObject;
 use stdClass;
+use Traversable;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
@@ -60,7 +61,7 @@ public function __construct($options = null)
     /**
      * Set options.
      *
-     * @param  array|\Traversable|WinCacheOptions $options
+     * @param  array|Traversable|WinCacheOptions $options
      * @return WinCache
      * @see    getOptions()
      */
diff --git a/src/Storage/Adapter/ZendServerDisk.php b/src/Storage/Adapter/ZendServerDisk.php
index e9fe81baa..82c09feb5 100644
--- a/src/Storage/Adapter/ZendServerDisk.php
+++ b/src/Storage/Adapter/ZendServerDisk.php
@@ -41,7 +41,7 @@ class ZendServerDisk extends AbstractZendServer implements
      * Constructor
      *
      * @param  null|array|\Traversable|AdapterOptions $options
-     * @throws Exception\ExceptionInterface
+     * @throws Exception\ExtensionNotLoadedException
      */
     public function __construct($options = array())
     {
@@ -84,6 +84,7 @@ public function clearByNamespace($namespace)
     /**
      * Get total space in bytes
      *
+     * @throws Exception\RuntimeException
      * @return int|float
      */
     public function getTotalSpace()
@@ -106,6 +107,7 @@ public function getTotalSpace()
     /**
      * Get available space in bytes
      *
+     * @throws Exception\RuntimeException
      * @return int|float
      */
     public function getAvailableSpace()
diff --git a/src/Storage/Adapter/ZendServerShm.php b/src/Storage/Adapter/ZendServerShm.php
index 63759e085..d20b6c995 100644
--- a/src/Storage/Adapter/ZendServerShm.php
+++ b/src/Storage/Adapter/ZendServerShm.php
@@ -31,7 +31,7 @@ class ZendServerShm extends AbstractZendServer implements
      * Constructor
      *
      * @param  null|array|\Traversable|AdapterOptions $options
-     * @throws Exception\ExceptionInterface
+     * @throws Exception\ExtensionNotLoadedException
      */
     public function __construct($options = array())
     {
diff --git a/src/Storage/Capabilities.php b/src/Storage/Capabilities.php
index 97dce7604..de0d3f07d 100644
--- a/src/Storage/Capabilities.php
+++ b/src/Storage/Capabilities.php
@@ -156,7 +156,7 @@ class Capabilities
     /**
      * Constructor
      *
-     * @param Adapter           $adapter
+     * @param StorageInterface  $storage
      * @param stdClass          $marker
      * @param array             $capabilities
      * @param null|Capabilities $baseCapabilities
@@ -179,7 +179,7 @@ public function __construct(
     /**
      * Get the storage adapter
      *
-     * @return Adapter
+     * @return StorageInterface
      */
     public function getAdapter()
     {
@@ -210,6 +210,7 @@ public function getSupportedDatatypes()
      *
      * @param  stdClass $marker
      * @param  array $datatypes
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setSupportedDatatypes(stdClass $marker, array $datatypes)
@@ -265,6 +266,7 @@ public function getSupportedMetadata()
      *
      * @param  stdClass $marker
      * @param  string[] $metadata
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setSupportedMetadata(stdClass $marker, array $metadata)
@@ -292,6 +294,7 @@ public function getMinTtl()
      *
      * @param  stdClass $marker
      * @param  int $minTtl
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setMinTtl(stdClass $marker, $minTtl)
@@ -318,6 +321,7 @@ public function getMaxTtl()
      *
      * @param  stdClass $marker
      * @param  int $maxTtl
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setMaxTtl(stdClass $marker, $maxTtl)
@@ -367,6 +371,7 @@ public function getTtlPrecision()
      *
      * @param  stdClass $marker
      * @param  float $ttlPrecision
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setTtlPrecision(stdClass $marker, $ttlPrecision)
@@ -437,6 +442,7 @@ public function getMaxKeyLength()
      *
      * @param  stdClass $marker
      * @param  int $maxKeyLength
+     * @throws Exception\InvalidArgumentException
      * @return Capabilities Fluent interface
      */
     public function setMaxKeyLength(stdClass $marker, $maxKeyLength)
@@ -514,7 +520,7 @@ protected function getCapability($property, $default = null)
      * Change a capability
      *
      * @param  stdClass $marker
-     * @param  string $name
+     * @param  string $property
      * @param  mixed $value
      * @return Capabilities Fluent interface
      * @throws Exception\InvalidArgumentException
diff --git a/src/Storage/ExceptionEvent.php b/src/Storage/ExceptionEvent.php
index d9ac2942d..f2eaf99f9 100644
--- a/src/Storage/ExceptionEvent.php
+++ b/src/Storage/ExceptionEvent.php
@@ -39,11 +39,11 @@ class ExceptionEvent extends PostEvent
      *
      * Accept a target and its parameters.
      *
-     * @param  string      $name
-     * @param  Adapter     $storage
+     * @param  string $name
+     * @param  StorageInterface $storage
      * @param  ArrayObject $params
-     * @param  mixed       $result
-     * @param  Exception   $exception
+     * @param  mixed $result
+     * @param  Exception $exception
      */
     public function __construct($name, StorageInterface $storage, ArrayObject $params, & $result, Exception $exception)
     {
diff --git a/src/Storage/Plugin/ClearExpiredByFactor.php b/src/Storage/Plugin/ClearExpiredByFactor.php
index 4b4d60a50..0fdbec2ea 100644
--- a/src/Storage/Plugin/ClearExpiredByFactor.php
+++ b/src/Storage/Plugin/ClearExpiredByFactor.php
@@ -36,7 +36,7 @@ class ClearExpiredByFactor extends AbstractPlugin
      *
      * @param  EventManagerInterface $events
      * @param  int                   $priority
-     * @return ClearByFactor
+     * @return ClearExpiredByFactor
      * @throws Exception\LogicException
      */
     public function attach(EventManagerInterface $events, $priority = 1)
@@ -62,7 +62,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
      * Detach
      *
      * @param  EventManagerInterface $events
-     * @return ClearByFactor
+     * @return ClearExpiredByFactor
      * @throws Exception\LogicException
      */
     public function detach(EventManagerInterface $events)
diff --git a/src/Storage/Plugin/PluginOptions.php b/src/Storage/Plugin/PluginOptions.php
index 9ca1b41dc..5bf20b74b 100644
--- a/src/Storage/Plugin/PluginOptions.php
+++ b/src/Storage/Plugin/PluginOptions.php
@@ -105,7 +105,8 @@ public function getClearingFactor()
      * Used by:
      * - ExceptionHandler
      *
-     * @param  callable ExceptionCallback
+     * @param  callable $exceptionCallback
+     * @throws Exception\InvalidArgumentException
      * @return PluginOptions
      */
     public function setExceptionCallback($exceptionCallback)
@@ -187,6 +188,7 @@ public function getOptimizingFactor()
      * - Serializer
      *
      * @param  string|SerializerAdapter $serializer
+     * @throws Exception\InvalidArgumentException
      * @return Serializer
      */
     public function setSerializer($serializer)
diff --git a/src/Storage/StorageInterface.php b/src/Storage/StorageInterface.php
index 8a5df0bcb..3c4f5ec00 100644
--- a/src/Storage/StorageInterface.php
+++ b/src/Storage/StorageInterface.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Cache\Storage;
 
+use Traversable;
+
 /**
  * @category   Zend
  * @package    Zend_Cache