revise cache API

+ update failing test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4317 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java

@@ -135,7 +135,7 @@ public abstract class AbstractAnnotationTest {
 		assertSame(r1, service.name(key));
 		Cache<Object, Object> cache = cm.getCache("default");
 		// assert the method name is used
-		assertTrue(cache.containsKey(keyName));
+		assertNotNull(cache.get(keyName));
 	}
 
 	public void testRootVars(CacheableService service) {
@@ -145,7 +145,7 @@ public abstract class AbstractAnnotationTest {
 		Cache<Object, Object> cache = cm.getCache("default");
 		// assert the method name is used
 		String expectedKey = "rootVarsrootVars" + AopProxyUtils.ultimateTargetClass(service) + service;
-		assertTrue(cache.containsKey(expectedKey));
+		assertNotNull(cache.get(expectedKey));
 	}
 
 	public void testNullArg(CacheableService service) {