diff --git a/src/main/java/br/ufrgs/inf/prosoft/cache/MultiCache.java b/src/main/java/br/ufrgs/inf/prosoft/cache/MultiCache.java
index 7fdbea5..756703b 100644
--- a/src/main/java/br/ufrgs/inf/prosoft/cache/MultiCache.java
+++ b/src/main/java/br/ufrgs/inf/prosoft/cache/MultiCache.java
@@ -57,7 +57,7 @@ public class MultiCache<K, V> implements Cache<K, V> {
@Override
public void put(K key, V value) {
invalidate(key);
- Optional<V> optional = value != null ? Optional.of(value) : Optional.empty();
+ Optional<V> optional = Optional.ofNullable(value);
this.map.put(key, optional);
String identifier = getIdentifier(value);
if (CACHE_REGISTER_SIZE) {