Improve Logs
Improve Task cache