reworked publish cache and clean up !