Replace EvictionListener with RemovalListener