diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..81802670
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/vendor/
+composer.lock
+
diff --git a/.travis.yml b/.travis.yml
index 926f1bf3..c575baeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ php:
 matrix:
   include:
     - php: 7.0
-      env: SEND_COVERAGE=true SUBSPLIT=true
+      env: SEND_COVERAGE=true
   fast_finish: true
 
 cache:
@@ -17,8 +17,11 @@ cache:
     - "$HOME/.composer/cache"
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION != hhvm && SEND_COVERAGE != true ]]; then phpenv config-rm xdebug.ini; fi
-  - composer self-update
+  - ./build/all.sh
+  - if [[ "$TRAVIS_PHP_VERSION" == '5.5' || "$TRAVIS_PHP_VERSION" == '5.6' ]]; then ./build/5.x.sh; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then ./build/7.x.sh; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == 'hhvm' ]]; then ./build/hhvm.sh; fi
+  - travis_retry composer self-update
 
 install:
   - travis_retry composer install --no-interaction --prefer-source
@@ -27,11 +30,10 @@ script:
   - vendor/bin/phpunit -c phpunit.xml.dist
 
 after_success:
-  - codecov # If coverage
-  - if [ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]; then ''; fi
-  - if [[ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]]; then ''; fi;
+  - if [[ "$SEND_COVERAGE" = true ]]; codecov; fi
 
-sudo: true
+sudo: required
+dist: precise
 
 notifications:
   email: false
diff --git a/.travis/Readme.md b/.travis/Readme.md
deleted file mode 100644
index 07f601ed..00000000
--- a/.travis/Readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory has has confiuration files for travis and also the subtree slit
\ No newline at end of file
diff --git a/build/5.x.sh b/build/5.x.sh
new file mode 100755
index 00000000..1e95fbbc
--- /dev/null
+++ b/build/5.x.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Install APC Adapter & APCu Adapter dependencies
+yes '' | pecl install apcu-4.0.8
+
+# Install Mongo
+echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
+echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
diff --git a/build/7.x.sh b/build/7.x.sh
new file mode 100755
index 00000000..e514d75e
--- /dev/null
+++ b/build/7.x.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Install APC Adapter & APCu Adapter dependencies
+yes '' | pecl install apcu-5.1.0
+
+# Install Mongo
+
+export KEY_SERVER="hkp://keyserver.ubuntu.com:80"
+export MONGO_REPO_URI="http://repo.mongodb.com/apt/ubuntu"
+export MONGO_REPO_TYPE="precise/mongodb-enterprise/"
+
+sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
+sudo apt-key adv --keyserver ${KEY_SERVER} --recv EA312927
+echo "deb ${MONGO_REPO_URI} ${MONGO_REPO_TYPE}${SERVER_VERSION} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
+sudo apt-get update -qq
+sudo apt-get install mongodb-enterprise
+sudo apt-get -y install gdb
+
+
+if ! nc -z localhost 27017; then sudo service mongod start; fi
+mongod --version
+pecl install -f mongodb-1.1.2
+mongo --eval 'tojson(db.runCommand({buildInfo:1}))'
+php --ri mongodb
\ No newline at end of file
diff --git a/build/Readme.md b/build/Readme.md
deleted file mode 100644
index 9940948e..00000000
--- a/build/Readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory has scripts to install dependencies on travis. 
\ No newline at end of file
diff --git a/build/all.sh b/build/all.sh
new file mode 100755
index 00000000..047c5038
--- /dev/null
+++ b/build/all.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Disable xdebug when hhvm or when SEND_COVERAGE is false
+if [ $TRAVIS_PHP_VERSION != hhvm && $SEND_COVERAGE != true ]; then phpenv config-rm xdebug.ini; fi
+
+# Doing something with phpenv
+if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php.ini; fi
+
+# Install codecov
+pip install --user codecov
+
+# Install Memcached extension
+if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
+if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
+
+# Install Redis extension
+mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d
+echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
\ No newline at end of file
diff --git a/build/hhvm.sh b/build/hhvm.sh
new file mode 100755
index 00000000..b8f08a68
--- /dev/null
+++ b/build/hhvm.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+# Don't need anything yet
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 65e434ff..a558c564 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,11 @@
 {
     "name":         "cache/cache",
     "type":         "library",
-    "description":  "",
-    "keywords":     ["cache", "psr6"],
+    "description":  "Library of all the php-cache adapters",
+    "keywords":     [
+        "cache",
+        "psr6"
+    ],
     "homepage":     "http://www.php-cache.com",
     "license":      "MIT",
     "authors":      [
@@ -17,55 +20,86 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
-        "php": "^5.5|^7.0",
-        "psr/cache": "^1.0"
+    "require":      {
+        "php":              "^5.5|^7.0",
+        "psr/cache":        "^1.0",
+        "mongodb/mongodb":  "^1.0",
+        "predis/predis":    "^1.0",
+        "doctrine/cache":   "^1.3",
+        "league/flysystem": "^1.0"
     },
     "require-dev":  {
-        "phpunit/phpunit": "^4.0|^5.1"
+        "phpunit/phpunit": "^4.0|^5.1",
+        "mockery/mockery": "^0.9"
+    },
+    "suggest":      {
+        "ext-apc":       "APC extension is required to use the APC Adapter",
+        "ext-apcu":      "APCu extension is required to use the APCu Adapter",
+        "ext-memcache":  "Memcache extension is required to use the Memcache Adapter",
+        "ext-memcached": "Memcached extension is required to use the Memcached Adapter",
+        "ext-redis":     "Redis extension is required to use the Redis adapter"
+    },
+    "replace":      {
+        "cache/apc-adapter":           "self.version",
+        "cache/apcu-adapter":          "self.version",
+        "cache/chain-adapter":         "self.version",
+        "cache/adapter-common":        "self.version",
+        "cache/doctrine-adapter":      "self.version",
+        "cache/filesystem-adapter":    "self.version",
+        "cache/memcache-adapter":      "self.version",
+        "cache/memcached-adapter":     "self.version",
+        "cache/mongodb-adapter":       "self.version",
+        "cache/array-adapter":         "self.version",
+        "cache/predis-adapter":        "self.version",
+        "cache/redis-adapter":         "self.version",
+        "cache/void-adapter":          "self.version",
+        "cache/psr-6-doctrine-bridge": "self.version",
+        "cache/hierarchical-cache":    "self.version",
+        "cache/integration-tests":     "self.version",
+        "cache/session-handler":       "self.version",
+        "cache/taggable-cache":        "self.version"
     },
     "autoload":     {
         "psr-4": {
-            "Cache\\Adapter\\Apc\\": "src/Adapter/Apc/src/",
-            "Cache\\Adapter\\Apcu\\": "src/Adapter/Apcu/src/",
-            "Cache\\Adapter\\Chain\\": "src/Adapter/Chain/src/",
-            "Cache\\Adapter\\Common\\": "src/Adapter/Common/src/",
-            "Cache\\Adapter\\Doctrine\\": "src/Adapter/Doctrine/src/",
+            "Cache\\Adapter\\Apc\\":        "src/Adapter/Apc/src/",
+            "Cache\\Adapter\\Apcu\\":       "src/Adapter/Apcu/src/",
+            "Cache\\Adapter\\Chain\\":      "src/Adapter/Chain/src/",
+            "Cache\\Adapter\\Common\\":     "src/Adapter/Common/src/",
+            "Cache\\Adapter\\Doctrine\\":   "src/Adapter/Doctrine/src/",
             "Cache\\Adapter\\Filesystem\\": "src/Adapter/Filesystem/src/",
-            "Cache\\Adapter\\Memcache\\": "src/Adapter/Memcache/src/",
-            "Cache\\Adapter\\Memcached\\": "src/Adapter/Memcached/src/",
-            "Cache\\Adapter\\MongoDB\\": "src/Adapter/MongoDB/src/",
-            "Cache\\Adapter\\PHPArray\\": "src/Adapter/PHPArray/src/",
-            "Cache\\Adapter\\Predis\\": "src/Adapter/Predis/src/",
-            "Cache\\Adapter\\Redis\\": "src/Adapter/Redis/src/",
-            "Cache\\Adapter\\Void\\": "src/Adapter/Void/src/",
-            "Cache\\Bridge\\": "src/Bridge/src/",
-            "Cache\\Hierarchy\\": "src/Hierarchy/src/",
-            "Cache\\IntegrationTests\\": "src/IntegrationTests/src/",
-            "Cache\\SessionHandler\\": "src/SessionHandler/src/",
-            "Cache\\Taggable\\": "src/Taggable/src/"
+            "Cache\\Adapter\\Memcache\\":   "src/Adapter/Memcache/src/",
+            "Cache\\Adapter\\Memcached\\":  "src/Adapter/Memcached/src/",
+            "Cache\\Adapter\\MongoDB\\":    "src/Adapter/MongoDB/src/",
+            "Cache\\Adapter\\PHPArray\\":   "src/Adapter/PHPArray/src/",
+            "Cache\\Adapter\\Predis\\":     "src/Adapter/Predis/src/",
+            "Cache\\Adapter\\Redis\\":      "src/Adapter/Redis/src/",
+            "Cache\\Adapter\\Void\\":       "src/Adapter/Void/src/",
+            "Cache\\Bridge\\":              "src/Bridge/src/",
+            "Cache\\Hierarchy\\":           "src/Hierarchy/src/",
+            "Cache\\IntegrationTests\\":    "src/IntegrationTests/src/",
+            "Cache\\SessionHandler\\":      "src/SessionHandler/src/",
+            "Cache\\Taggable\\":            "src/Taggable/src/"
         }
     },
-    "autoload-dev":     {
+    "autoload-dev": {
         "psr-4": {
-            "Cache\\Adapter\\Apc\\Tests\\": "src/Adapter/Apc/tests/",
-            "Cache\\Adapter\\Apcu\\Tests\\": "src/Adapter/Apcu/tests/",
-            "Cache\\Adapter\\Chain\\Tests\\": "src/Adapter/Chain/tests/",
-            "Cache\\Adapter\\Common\\Tests\\": "src/Adapter/Common/tests/",
-            "Cache\\Adapter\\Doctrine\\Tests\\": "src/Adapter/Doctrine/tests/",
+            "Cache\\Adapter\\Apc\\Tests\\":        "src/Adapter/Apc/tests/",
+            "Cache\\Adapter\\Apcu\\Tests\\":       "src/Adapter/Apcu/tests/",
+            "Cache\\Adapter\\Chain\\Tests\\":      "src/Adapter/Chain/tests/",
+            "Cache\\Adapter\\Common\\Tests\\":     "src/Adapter/Common/tests/",
+            "Cache\\Adapter\\Doctrine\\Tests\\":   "src/Adapter/Doctrine/tests/",
             "Cache\\Adapter\\Filesystem\\Tests\\": "src/Adapter/Filesystem/tests/",
-            "Cache\\Adapter\\Memcache\\Tests\\": "src/Adapter/Memcache/tests/",
-            "Cache\\Adapter\\Memcached\\Tests\\": "src/Adapter/Memcached/tests/",
-            "Cache\\Adapter\\MongoDB\\Tests\\": "src/Adapter/MongoDB/tests/",
-            "Cache\\Adapter\\PHPArray\\Tests\\": "src/Adapter/PHPArray/tests/",
-            "Cache\\Adapter\\Predis\\Tests\\": "src/Adapter/Predis/tests/",
-            "Cache\\Adapter\\Redis\\Tests\\": "src/Adapter/Redis/tests/",
-            "Cache\\Adapter\\Void\\Tests\\": "src/Adapter/Void/tests/",
-            "Cache\\Bridge\\Tests\\": "src/Bridge/tests/",
-            "Cache\\Hierarchy\\Tests\\": "src/Hierarchy/tests/",
-            "Cache\\SessionHandler\\Tests\\": "src/SessionHandler/tests/",
-            "Cache\\Taggable\\Tests\\": "src/Taggable/tests/"
+            "Cache\\Adapter\\Memcache\\Tests\\":   "src/Adapter/Memcache/tests/",
+            "Cache\\Adapter\\Memcached\\Tests\\":  "src/Adapter/Memcached/tests/",
+            "Cache\\Adapter\\MongoDB\\Tests\\":    "src/Adapter/MongoDB/tests/",
+            "Cache\\Adapter\\PHPArray\\Tests\\":   "src/Adapter/PHPArray/tests/",
+            "Cache\\Adapter\\Predis\\Tests\\":     "src/Adapter/Predis/tests/",
+            "Cache\\Adapter\\Redis\\Tests\\":      "src/Adapter/Redis/tests/",
+            "Cache\\Adapter\\Void\\Tests\\":       "src/Adapter/Void/tests/",
+            "Cache\\Bridge\\Tests\\":              "src/Bridge/tests/",
+            "Cache\\Hierarchy\\Tests\\":           "src/Hierarchy/tests/",
+            "Cache\\SessionHandler\\Tests\\":      "src/SessionHandler/tests/",
+            "Cache\\Taggable\\Tests\\":            "src/Taggable/tests/"
         }
     }
 }
diff --git a/src/Adapter/Apc/composer.json b/src/Adapter/Apc/composer.json
index f3b2525f..41a432d8 100644
--- a/src/Adapter/Apc/composer.json
+++ b/src/Adapter/Apc/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "apc",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/apc-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/apc-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5",
         "ext-apc":              "*",
-        "psr/cache":            "~1.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.2",
         "cache/taggable-cache": "^0.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Apc\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Apc\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Apcu/composer.json b/src/Adapter/Apcu/composer.json
index 63b46636..faaac5fe 100644
--- a/src/Adapter/Apcu/composer.json
+++ b/src/Adapter/Apcu/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "apcu",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/apcu-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/apcu-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "ext-apcu":              "*",
-        "psr/cache":            "1.0.0",
+        "ext-apcu":             "*",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.1",
         "cache/taggable-cache": "^0.2"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "dev-master"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Apcu\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Apcu\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Chain/composer.json b/src/Adapter/Chain/composer.json
index 49dd8ef5..0e5e030f 100644
--- a/src/Adapter/Chain/composer.json
+++ b/src/Adapter/Chain/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "chain",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/chain-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/chain-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,32 +23,27 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "1.0.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.1",
         "cache/taggable-cache": "^0.2"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "dev-master",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7",
         "cache/predis-adapter":    "@stable",
         "cache/array-adapter":     "@stable"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Chain\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Chain\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Common/composer.json b/src/Adapter/Common/composer.json
index cc48e3a8..9b597a20 100644
--- a/src/Adapter/Common/composer.json
+++ b/src/Adapter/Common/composer.json
@@ -4,15 +4,13 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "tag"
     ],
     "homepage":          "https://github.com/php-cache/adapter-common",
-    "authors":
-    [
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -24,29 +22,25 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "1.0.0",
+        "psr/cache":            "^1.0",
         "cache/taggable-cache": "^0.2|^0.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0"
+    "require-dev":       {
+        "phpunit/phpunit": "^4.0|^5.1"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Common\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Common\\Tests\\": "tests/"
         }
     },
-    "extra": {
+    "extra":             {
         "branch-alias": {
             "dev-master": "0.2.x-dev"
         }
diff --git a/src/Adapter/Doctrine/composer.json b/src/Adapter/Doctrine/composer.json
index 7b402acc..920ec108 100644
--- a/src/Adapter/Doctrine/composer.json
+++ b/src/Adapter/Doctrine/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "doctrine",
         "tag"
     ],
     "homepage":          "https://github.com/php-cache/doctrine-adapter",
-    "authors":
-    [
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,37 +23,32 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
-        "psr/cache":            "1.0",
+    "require":           {
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.2",
         "cache/taggable-cache": "^0.3",
         "doctrine/cache":       "^1.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "mockery/mockery":         "^0.9.4",
-        "cache/integration-tests": "^0.7"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7",
+        "mockery/mockery":         "^0.9"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "suggest":      {
+    "suggest":           {
         "ext-apc":       "Allows for caching with Apc",
         "ext-memcache":  "Allows for caching with Memcache",
         "ext-memcached": "Allows for caching with Memcached",
         "ext-redis":     "Allows for caching with Redis"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Doctrine\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Doctrine\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Filesystem/composer.json b/src/Adapter/Filesystem/composer.json
index 51996c87..bab11f7a 100644
--- a/src/Adapter/Filesystem/composer.json
+++ b/src/Adapter/Filesystem/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "filesystem",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/filesystem-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/filesystem-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "~1.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.2",
         "cache/taggable-cache": "^0.3",
         "league/flysystem":     "^1.0"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "~1.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Filesystem\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Filesystem\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Memcache/composer.json b/src/Adapter/Memcache/composer.json
index b269f491..0cd94702 100644
--- a/src/Adapter/Memcache/composer.json
+++ b/src/Adapter/Memcache/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "memcache",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/memcache-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/memcache-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5",
         "ext-memcache":         "*",
-        "psr/cache":            "1.0.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.1",
         "cache/taggable-cache": "^0.2"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "dev-master"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Memcache\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Memcache\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Memcached/composer.json b/src/Adapter/Memcached/composer.json
index be8a1db5..bf6e320c 100644
--- a/src/Adapter/Memcached/composer.json
+++ b/src/Adapter/Memcached/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "memcached",
         "tag"
     ],
     "homepage":          "https://github.com/php-cache/doctrine-adapter",
-    "authors":
-    [
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,32 +23,27 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
-        "php":                  "^5.5|^7.0",
-        "ext-memcached":        "*",
-        "psr/cache":            "1.0.0",
-        "cache/adapter-common": "^0.2",
-        "cache/taggable-cache": "^0.3",
+    "require":           {
+        "php":                      "^5.5|^7.0",
+        "ext-memcached":            "*",
+        "psr/cache":                "^1.0",
+        "cache/adapter-common":     "^0.2",
+        "cache/taggable-cache":     "^0.3",
         "cache/hierarchical-cache": "^0.2"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "^0.6"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Memcached\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Memcached\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/MongoDB/composer.json b/src/Adapter/MongoDB/composer.json
index c86d31fb..d4e03a43 100644
--- a/src/Adapter/MongoDB/composer.json
+++ b/src/Adapter/MongoDB/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "beta",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "mongodb",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/mongodb-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/mongodb-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "1.0.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.1",
         "cache/taggable-cache": "^0.2",
         "mongodb/mongodb":      "^1.0"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "dev-master"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\MongoDB\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\MongoDB\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/PHPArray/composer.json b/src/Adapter/PHPArray/composer.json
index e6649e14..14c3c590 100644
--- a/src/Adapter/PHPArray/composer.json
+++ b/src/Adapter/PHPArray/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "array",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/array-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/array-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,31 +23,26 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                      "^5.5|^7.0",
-        "psr/cache":                "~1.0",
+        "psr/cache":                "^1.0",
         "cache/adapter-common":     "^0.2",
         "cache/hierarchical-cache": "^0.2",
         "cache/taggable-cache":     "^0.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "~1.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\PHPArray\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\PHPArray\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json
index 5d6cf708..b6e06d64 100644
--- a/src/Adapter/Predis/composer.json
+++ b/src/Adapter/Predis/composer.json
@@ -4,17 +4,15 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "redis",
         "predis",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/predis-adapter",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/predis-adapter",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -26,32 +24,27 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                      "^5.5|^7.0",
-        "psr/cache":                "1.0.0",
-        "cache/adapter-common":     "^0.1.2",
+        "psr/cache":                "^1.0",
+        "cache/adapter-common":     "^0.2",
         "cache/taggable-cache":     "^0.3",
         "cache/hierarchical-cache": "^0.1",
         "predis/predis":            "^1.0"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
-        "cache/integration-tests": "dev-master"
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
+        "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Predis\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Predis\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Redis/composer.json b/src/Adapter/Redis/composer.json
index b71b786b..1600a61b 100644
--- a/src/Adapter/Redis/composer.json
+++ b/src/Adapter/Redis/composer.json
@@ -4,17 +4,15 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "phpredis",
         "redis",
         "tag"
     ],
-    "homepage": "http://www.php-cache.com",
-    "authors":
-    [
+    "homepage":          "http://www.php-cache.com",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -26,32 +24,27 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
-        "php":                  "^5.5|^7.0",
-        "ext-redis":            "*",
-        "psr/cache":            "1.0.0",
-        "cache/adapter-common": "^0.2",
-        "cache/taggable-cache": "^0.3",
+    "require":           {
+        "php":                      "^5.5|^7.0",
+        "ext-redis":                "*",
+        "psr/cache":                "^1.0",
+        "cache/adapter-common":     "^0.2",
+        "cache/taggable-cache":     "^0.3",
         "cache/hierarchical-cache": "^0.2"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Redis\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Redis\\Tests\\": "tests/"
         }
diff --git a/src/Adapter/Void/composer.json b/src/Adapter/Void/composer.json
index 5375a2c0..f938e6f0 100644
--- a/src/Adapter/Void/composer.json
+++ b/src/Adapter/Void/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "void",
         "tag"
     ],
-    "homepage": "http://www.php-cache.com",
-    "authors":
-    [
+    "homepage":          "http://www.php-cache.com",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,30 +23,25 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "~1.0",
+        "psr/cache":            "^1.0",
         "cache/adapter-common": "^0.2",
         "cache/taggable-cache": "^0.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/integration-tests": "^0.7"
     },
-    "provide":
-    {
-        "psr/cache-implementation": "1.0.0"
+    "provide":           {
+        "psr/cache-implementation": "^1.0"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Adapter\\Void\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Adapter\\Void\\Tests\\": "tests/"
         }
diff --git a/src/Bridge/composer.json b/src/Bridge/composer.json
index d0dc4bb2..afe08bff 100644
--- a/src/Bridge/composer.json
+++ b/src/Bridge/composer.json
@@ -19,12 +19,12 @@
     "require":      {
         "php":                      "^5.5|^7.0",
         "doctrine/cache":           "^1.3",
-        "psr/cache-implementation": "~1.0"
+        "psr/cache-implementation": "^1.0"
     },
     "require-dev":  {
-        "phpunit/phpunit":              "^5.1|^4.0",
-        "mockery/mockery":              "^0.9.4",
-        "cache/doctrine-adapter":       "@stable"
+        "phpunit/phpunit":        "^4.0|^5.1",
+        "mockery/mockery":        "^0.9",
+        "cache/doctrine-adapter": "@stable"
     },
     "autoload":     {
         "psr-4": {
diff --git a/src/Hierarchy/composer.json b/src/Hierarchy/composer.json
index 52bc523a..1a216122 100644
--- a/src/Hierarchy/composer.json
+++ b/src/Hierarchy/composer.json
@@ -4,16 +4,14 @@
     "type":              "library",
     "license":           "MIT",
     "minimum-stability": "stable",
-    "keywords":
-    [
+    "keywords":          [
         "cache",
         "psr-6",
         "hierarchical",
         "tag"
     ],
-    "homepage": "https://github.com/php-cache/hierarchical-cache",
-    "authors":
-    [
+    "homepage":          "https://github.com/php-cache/hierarchical-cache",
+    "authors":           [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -25,26 +23,22 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
+    "require":           {
         "php":                  "^5.5|^7.0",
-        "psr/cache":            "1.0.0",
+        "psr/cache":            "^1.0",
         "cache/taggable-cache": "^0.3"
     },
-    "require-dev":
-    {
-        "phpunit/phpunit":         "^5.1|^4.0",
+    "require-dev":       {
+        "phpunit/phpunit":         "^4.0|^5.1",
         "cache/array-adapter":     "@stable",
-        "cache/integration-tests": "dev-master"
+        "cache/integration-tests": "^0.7"
     },
-    "autoload":
-    {
+    "autoload":          {
         "psr-4": {
             "Cache\\Hierarchy\\": "src/"
         }
     },
-    "autoload-dev":
-    {
+    "autoload-dev":      {
         "psr-4": {
             "Cache\\Hierarchy\\Tests\\": "tests/"
         }
diff --git a/src/IntegrationTests/composer.json b/src/IntegrationTests/composer.json
index 32d1a907..f0e1b9bb 100755
--- a/src/IntegrationTests/composer.json
+++ b/src/IntegrationTests/composer.json
@@ -22,11 +22,11 @@
         }
     ],
     "require":     {
-        "php":       "^5.4|^7",
-        "psr/cache": "~1.0"
+        "php":       "^5.4|^7.0",
+        "psr/cache": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0|^5.0"
+        "phpunit/phpunit": "^4.0|^5.1"
     },
     "autoload":    {
         "psr-4": {
diff --git a/src/SessionHandler/composer.json b/src/SessionHandler/composer.json
index 4dc98096..734e3ff0 100644
--- a/src/SessionHandler/composer.json
+++ b/src/SessionHandler/composer.json
@@ -2,14 +2,14 @@
     "name":         "cache/session-handler",
     "type":         "library",
     "description":  "An implementation of PHP's SessionHandlerInterface that allows PSR-6",
-    "keywords": [
+    "keywords":     [
         "cache",
         "psr-6",
         "session handler"
     ],
-    "homepage": "https://github.com/php-cache/session-handler",
-    "license": "MIT",
-    "authors": [
+    "homepage":     "https://github.com/php-cache/session-handler",
+    "license":      "MIT",
+    "authors":      [
         {
             "name":     "Aaron Scherer",
             "email":    "aequasi@gmail.com",
@@ -21,16 +21,16 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require": {
-        "php": "^5.5|^7.0",
-        "psr/cache": "~1.0"
+    "require":      {
+        "php":       "^5.5|^7.0",
+        "psr/cache": "^1.0"
     },
-    "require-dev": {
-        "phpunit/phpunit": "^5.1|^4.0",
-        "mockery/mockery": "^0.9.4",
+    "require-dev":  {
+        "phpunit/phpunit":     "^4.0|^5.1",
+        "mockery/mockery":     "^0.9",
         "cache/array-adapter": "@stable"
     },
-    "autoload": {
+    "autoload":     {
         "psr-4": {
             "Cache\\SessionHandler\\": "src/"
         }
diff --git a/src/Taggable/composer.json b/src/Taggable/composer.json
index 66810e4a..d35413eb 100644
--- a/src/Taggable/composer.json
+++ b/src/Taggable/composer.json
@@ -2,7 +2,12 @@
     "name":         "cache/taggable-cache",
     "type":         "library",
     "description":  "Add tag support to your PSR-6 cache implementation",
-    "keywords":     ["cache", "psr6", "tag", "taggable"],
+    "keywords":     [
+        "cache",
+        "psr6",
+        "tag",
+        "taggable"
+    ],
     "homepage":     "https://github.com/php-cache/taggable-cache",
     "license":      "MIT",
     "authors":      [
@@ -17,13 +22,12 @@
             "homepage": "https://github.com/nyholm"
         }
     ],
-    "require":
-    {
-        "php":       "^5.4|^7",
-        "psr/cache": "1.0.0"
+    "require":      {
+        "php":       "^5.4|^7.0",
+        "psr/cache": "^1.0"
     },
     "require-dev":  {
-        "phpunit/phpunit": "^5.1|^4.0"
+        "phpunit/phpunit": "^4.0|^5.1"
     },
     "autoload":     {
         "psr-4": {