diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
index 608ea6441..60d88a639 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
@@ -19,7 +19,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import com.google.common.cache.Cache;
+import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.nimbusds.jose.JWSVerifier;
@@ -39,7 +39,7 @@ import com.nimbusds.jose.jwk.RSAKey;
 @Service
 public class JWKSetSigningAndValidationServiceCacheService {
 
-	private Cache<String, JwtSigningAndValidationService> cache;
+	private LoadingCache<String, JwtSigningAndValidationService> cache;
 
 	public JWKSetSigningAndValidationServiceCacheService() {
 		this.cache = CacheBuilder.newBuilder()
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
index 8e368303b..06565b47c 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
@@ -6,8 +6,6 @@ package org.mitre.oauth2.service.impl;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import org.mitre.oauth2.model.SystemScope;
 import org.mitre.oauth2.repository.SystemScopeRepository;
 import org.mitre.oauth2.service.SystemScopeService;
@@ -32,7 +30,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
 	
 	private Predicate<SystemScope> isDefault = new Predicate<SystemScope>() {
 		@Override
-        public boolean apply(@Nullable SystemScope input) {
+        public boolean apply(SystemScope input) {
 			return (input != null && input.isDefaultScope());
         }
 	};
@@ -40,14 +38,14 @@ public class DefaultSystemScopeService implements SystemScopeService {
 	
 	private Predicate<SystemScope> isDynReg = new Predicate<SystemScope>() {
 		@Override
-        public boolean apply(@Nullable SystemScope input) {
+        public boolean apply(SystemScope input) {
 			return (input != null && input.isAllowDynReg());
         }
 	};
 	
 	private Function<String, SystemScope> stringToSystemScope = new Function<String, SystemScope>() {
 		@Override
-        public SystemScope apply(@Nullable String input) {
+        public SystemScope apply(String input) {
 			if (input == null) {
 				return null;
 			} else {
@@ -65,7 +63,7 @@ public class DefaultSystemScopeService implements SystemScopeService {
 	
 	private Function<SystemScope, String> systemScopeToString = new Function<SystemScope, String>() {
 		@Override
-        public String apply(@Nullable SystemScope input) {
+        public String apply(SystemScope input) {
 			if (input == null) {
 				return null;
 			} else {
diff --git a/pom.xml b/pom.xml
index 55b03b11d..7ab3dea5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,7 +333,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>10.0.1</version>
+            <version>14.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>