diff --git a/geocode/geocode-impl/src/main/java/at/wrk/geocode/impl/ChainedGeocoder.java b/geocode/geocode-impl/src/main/java/at/wrk/geocode/impl/ChainedGeocoder.java
index 5eddf8c5..f61552e9 100644
--- a/geocode/geocode-impl/src/main/java/at/wrk/geocode/impl/ChainedGeocoder.java
+++ b/geocode/geocode-impl/src/main/java/at/wrk/geocode/impl/ChainedGeocoder.java
@@ -53,10 +53,10 @@ public ChainedGeocoder(Geocoder<Address>... geocoders) {
   @Override
   public LatLng geocode(Address address) {
     // First look in cache
-    CacheEntry entry = cacheRepository.findOne(Example.of(new CacheEntry(address), addressMatcher));
-    if (entry != null) {
+    List<CacheEntry> entries = cacheRepository.findAll(Example.of(new CacheEntry(address), addressMatcher));
+    if (!entries.isEmpty()) {
       LOG.debug("Found coordinates for address '{}' in cache", address);
-      return entry.getCoordinates();
+      return entries.get(0).getCoordinates();
     }
 
     // Now try all the geocoders in order