Update

Add possibility to clear on demand only and fix chain of promises.