Fix some cache reload issues
Fix some restoration stuff