diff --git a/pom.xml b/pom.xml
index 58af2440..87846e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
 		<dependency>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-jaxrs_2.10</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.7</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>jsr311-api</artifactId>
@@ -213,7 +213,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.2.1</version>
+			<version>2.5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -276,7 +276,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.31</version>
+			<version>5.1.32</version>
 		</dependency>
 		<dependency>
 			<groupId>postgresql</groupId>
diff --git a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java
index 2a50a6b2..15f2b5fa 100644
--- a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java
+++ b/src/main/java/com/commafeed/backend/cache/RedisCacheService.java
@@ -5,9 +5,6 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.pool.impl.GenericObjectPool;
-
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
@@ -32,7 +29,7 @@ public class RedisCacheService extends CacheService {
 
 	public RedisCacheService() {
 		JedisPoolConfig config = new JedisPoolConfig();
-		config.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_GROW);
+		config.setBlockWhenExhausted(false);
 		pool = new JedisPool(config, "localhost");
 	}