JCache todos and first cleanups