azkaban-developers

diff --git a/azkaban-common/src/main/java/azkaban/executor/ActiveExecutors.java b/azkaban-common/src/main/java/azkaban/executor/ActiveExecutors.java
index a760ec8..ab01d2e 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ActiveExecutors.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ActiveExecutors.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.log4j.Logger;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 
 /**
@@ -58,7 +58,7 @@ public class ActiveExecutors {
     // }
   }
 
-  public GetterCache<Collection<Executor>> getAllCache = new GetterCache<>("instance-getter:ActiveExecutors.getAll");
+  public CaffeineGetterCache<Collection<Executor>> getAllCache = new CaffeineGetterCache<>("instance-getter:ActiveExecutors.getAll");
 
   /**
    * Returns all executors. The result is cached. To reload, call {@link #setupExecutors()}.

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
index 2371639..f906bfb 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
@@ -47,8 +47,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.log4j.Logger;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
-import br.ufrgs.inf.prosoft.cache.KeyNotFoundException;
+import br.ufrgs.inf.prosoft.cache.*;
 
 @Singleton
 public class ProjectManager {
@@ -64,8 +63,8 @@ public class ProjectManager {
       // new ConcurrentHashMap<>();
   // private final CaseInsensitiveConcurrentHashMap<Project> projectsByName =
       // new CaseInsensitiveConcurrentHashMap<>();
-  public MultiCache<String, Project> projectsByNameCache = new MultiCache<>("instance-multi:ProjectManager.projectsByName");
-  public MultiCache<Integer, Project> projectsByIdCache = new MultiCache<>("instance-multi:ProjectManager.projectsById");
+  public Caffeine<String, Project> projectsByNameCache = new Caffeine<>("instance-multi:ProjectManager.projectsByName");
+  public Caffeine<Integer, Project> projectsByIdCache = new Caffeine<>("instance-multi:ProjectManager.projectsById");
 
 
   @Inject

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java b/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
index 3cfed76..bae8213 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 public class ServerStatisticsServlet extends HttpServlet {
 
@@ -192,7 +192,7 @@ public class ServerStatisticsServlet extends HttpServlet {
     return returnResult;
   }
 
-    public static GetterCache<ExecutorInfo> populateStatisticsCache = new GetterCache<>("static-getter:ServerStatisticsServlet.populateStatistics");
+    public static CaffeineGetterCache<ExecutorInfo> populateStatisticsCache = new CaffeineGetterCache<>("static-getter:ServerStatisticsServlet.populateStatistics", 1000);
 
   /**
    * call the data providers to fill the returning data container for statistics data. This function