[TASK] Cleanup and fix cache issue ...