Fix regression
Add logging
Prevent changing the state of static
Improve logging
Fix concurrent cache issue with State Recovery
Refactor, no functional change