Removing javax.cache and using plain ConcurrentMap in the API