Fix distributed cache issue
Refactoring and documentation
Cleaning