Clone instead of freeze values from mem
Make sure to clone cached values
Start to implement saving again