diff --git a/.travis.yml b/.travis.yml
index 511703b9d..0cabcb33e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,11 @@ services:
     - docker
 
 cache:
+    bundler: true
     directories:
         - $HOME/.composer/cache
+        - $HOME/php-amqp
+        - $HOME/rabbitmq-c
 
 install:
     - sudo /etc/init.d/mysql stop
@@ -27,4 +30,4 @@ install:
 
 script:
     - bin/phpunit --exclude-group=functional
-    - bin/dev -bt
+    - bin/dev -bt
\ No newline at end of file
diff --git a/composer.json b/composer.json
index cce8a9151..a0d3ffed8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,16 @@
 {
   "name": "enqueue/dev-message-queue",
   "type": "project",
-  "minimum-stability": "dev",
+  "minimum-stability": "stable",
   "require": {
     "php": ">=5.6",
-    "enqueue/psr-queue": "*",
-    "enqueue/enqueue": "*",
-    "enqueue/stomp": "*",
-    "enqueue/amqp-ext": "*",
-    "enqueue/enqueue-bundle": "*",
-    "enqueue/job-queue": "*",
-    "enqueue/test": "*"
+    "enqueue/psr-queue": "dev-master",
+    "enqueue/enqueue": "dev-master",
+    "enqueue/stomp": "dev-master",
+    "enqueue/amqp-ext": "dev-master",
+    "enqueue/enqueue-bundle": "dev-master",
+    "enqueue/job-queue": "dev-master",
+    "enqueue/test": "dev-master"
   },
   "require-dev": {
     "phpunit/phpunit": "^5",
diff --git a/pkg/amqp-ext/.travis.yml b/pkg/amqp-ext/.travis.yml
index df75087e6..7d1db94cd 100644
--- a/pkg/amqp-ext/.travis.yml
+++ b/pkg/amqp-ext/.travis.yml
@@ -12,6 +12,7 @@ php:
 cache:
     directories:
         - $HOME/.composer/cache
+        - $HOME/php-amqp
 
 install:
     - travis/build-php-amqp-ext
diff --git a/pkg/amqp-ext/travis/build-php-amqp-ext b/pkg/amqp-ext/travis/build-php-amqp-ext
index edaca744a..54a2ad95d 100755
--- a/pkg/amqp-ext/travis/build-php-amqp-ext
+++ b/pkg/amqp-ext/travis/build-php-amqp-ext
@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 
-# build librabbitmq
-cd $HOME
-git clone git://github.com/alanxz/rabbitmq-c.git
-cd $HOME/rabbitmq-c
-git submodule init && git submodule update
-autoreconf -i && ./configure --prefix=$HOME/rabbitmq-c && make && make install
+if [ ! -f $HOME/php-amqp/modules/amqp.so ]; then
+    # build librabbitmq
+    cd $HOME
+    git clone git://github.com/alanxz/rabbitmq-c.git
+    cd $HOME/rabbitmq-c
+    git submodule init && git submodule update
+    autoreconf -i && ./configure --prefix=$HOME/rabbitmq-c && make && make install
 
-# build php-amqp extension
-cd $HOME
-git clone git://github.com/pdezwart/php-amqp.git
-cd $HOME/php-amqp
-phpize && ./configure  --with-librabbitmq-dir=$HOME/rabbitmq-c && make && make install
-echo "extension=amqp.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+    # build php-amqp extension
+    cd $HOME
+    git clone git://github.com/pdezwart/php-amqp.git
+    cd $HOME/php-amqp
+    phpize && ./configure  --with-librabbitmq-dir=$HOME/rabbitmq-c && make && make install
+fi
+
+echo "extension=$HOME/php-amqp/modules/amqp.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini