Completed and refactored the Cache components.

rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java

@@ -23,17 +23,22 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.cache.impl.CacheDSL;
+import org.rapidoid.cache.impl.ConcurrentCacheAtom;
+import org.rapidoid.lambda.Mapper;
+
+import java.util.concurrent.Callable;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")
 public class Cache extends RapidoidThing {
 
-	public static <K, V> CacheDSL<K, V> of(org.rapidoid.lambda.Mapper<K, V> of) {
+	public static <K, V> CacheDSL<K, V> of(Mapper<K, V> of) {
 		return new CacheDSL<K, V>().of(of);
 	}
 
-	public static <K, V> Cached<K, V> none() {
-		return new NotCached<>();
+	public static <T> CacheAtom<T> atom(Callable<T> loader, long ttlInMs) {
+		return new ConcurrentCacheAtom<>(loader, ttlInMs);
 	}
 
 }

rapidoid-commons/src/main/java/org/rapidoid/cache/CachedCalc.java → rapidoid-commons/src/main/java/org/rapidoid/cache/CacheAtom.java

@@ -25,16 +25,26 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")
-public interface CachedCalc<V> {
+public interface CacheAtom<V> {
 
 	/**
 	 * Returns the cached value, recalculating/reloading it if expired.
 	 */
 	V get();
 
 	/**
-	 * Invalidates the cache.
+	 * Retrieves the cached value if it exists, or <code>null</code> otherwise.
+	 */
+	V getIfExists();
+
+	/**
+	 * Invalidates the cached value.
 	 */
 	void invalidate();
 
+	/**
+	 * Sets a new cached value.
+	 */
+	void set(V value);
+
 }

rapidoid-commons/src/main/java/org/rapidoid/cache/Cached.java

@@ -27,8 +27,24 @@
 @Since("5.3.0")
 public interface Cached<K, V> {
 
+	/**
+	 * Returns the cached value for the given key, recalculating/reloading it if expired.
+	 */
 	V get(K key);
 
+	/**
+	 * Retrieves the cached value for the given key if it exists, or <code>null</code> otherwise.
+	 */
 	V getIfExists(K key);
 
+	/**
+	 * Invalidates the cached value for the given key.
+	 */
+	void invalidate(K key);
+
+	/**
+	 * Sets a new cached value for the given key.
+	 */
+	void set(K key, V value);
+
 }

rapidoid-commons/src/main/java/org/rapidoid/cache/CacheDSL.java → rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheDSL.java

@@ -1,4 +1,4 @@
-package org.rapidoid.cache;
+package org.rapidoid.cache.impl;
 
 /*
  * #%L
@@ -23,6 +23,7 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.cache.Cached;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")

rapidoid-commons/src/main/java/org/rapidoid/cache/CacheFactory.java → rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheFactory.java

@@ -1,4 +1,4 @@
-package org.rapidoid.cache;
+package org.rapidoid.cache.impl;
 
 /*
  * #%L
@@ -28,8 +28,8 @@
 @Since("5.3.0")
 public class CacheFactory extends RapidoidThing {
 
-	public static <K, V> CachedImpl<K, V> create(CacheDSL<K, V> params) {
-		return new CachedImpl<K, V>(params.capacity(), params.of(), params.ttl());
+	public static <K, V> ConcurrentCached<K, V> create(CacheDSL<K, V> params) {
+		return new ConcurrentCached<K, V>(params.capacity(), params.of(), params.ttl());
 	}
 
 }