petclinic-aplcache

diff --git a/src/main/java/org/petclinic/owner/PetController.java b/src/main/java/org/petclinic/owner/PetController.java
index 39a11db..6a489cd 100644
--- a/src/main/java/org/petclinic/owner/PetController.java
+++ b/src/main/java/org/petclinic/owner/PetController.java
@@ -23,7 +23,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.validation.Valid;
 import java.util.Collection;
@@ -47,7 +47,7 @@ class PetController {
         this.owners = owners;
     }
 
-    public static GetterCache<Collection<PetType>> populatePetTypesCache = new GetterCache<>("static-getter:PetController.populatePetTypes");
+    public static CaffeineGetterCache<Collection<PetType>> populatePetTypesCache = new CaffeineGetterCache<>("static-getter:PetController.populatePetTypes", 60000);
 
     @ModelAttribute("types")
     public Collection<PetType> populatePetTypes() {

diff --git a/src/main/java/org/petclinic/owner/PetTypeFormatter.java b/src/main/java/org/petclinic/owner/PetTypeFormatter.java
index bc1c5b4..d0234b4 100644
--- a/src/main/java/org/petclinic/owner/PetTypeFormatter.java
+++ b/src/main/java/org/petclinic/owner/PetTypeFormatter.java
@@ -53,7 +53,7 @@ public class PetTypeFormatter implements Formatter<PetType> {
         return petType.getName();
     }
 
-    public static APLCache<PetType> parseCache = new APLCache<>("static-multi:PetTypeFormatter.parse");
+    public static APLCache<PetType> parseCache = new APLCache<>("static-multi:PetTypeFormatter.parse", 60000);
     @Override
     public PetType parse(String text, Locale locale) throws ParseException {
         PetType petType = parseCache.computeIfAbsent(Thread.currentThread(), new Object[]{text, locale}, () -> {

diff --git a/src/main/java/org/petclinic/vet/VetController.java b/src/main/java/org/petclinic/vet/VetController.java
index b42b16f..24b6c57 100644
--- a/src/main/java/org/petclinic/vet/VetController.java
+++ b/src/main/java/org/petclinic/vet/VetController.java
@@ -15,7 +15,7 @@
  */
 package org.petclinic.vet;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 import java.util.Collection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -50,7 +50,7 @@ class VetController {
         return "vets/vetList";
     }
 
-    public static GetterCache<Vets> showResourcesVetListCache = new GetterCache<>("static-getter:VetController.showResourcesVetList");
+    public static CaffeineGetterCache<Vets> showResourcesVetListCache = new CaffeineGetterCache<>("static-getter:VetController.showResourcesVetList", 60000);
 
     @GetMapping({"/vets.json", "/vets.xml"})
     public @ResponseBody
@@ -61,7 +61,7 @@ class VetController {
             Vets vets = new Vets();
             vets.getVetList().addAll(findAll());
             return vets;
-        });
+        }, 60000);
     }
 
     private Collection<Vet> findAll() {