Fix failed - Revert changes
Fix not cleaning cache