Improved - Regenerate cache dir
Add placeholders
Small fix style