Cluster is not checked if it's in embedded mode.
Corrected annotations for Caches
Removed completely persistence dependency on ES