[FOLD] More Livecache rewrite