[FEATURE] - Prompt Updates for best practices and maximal cache hit

[patrickfleith]

• We need to review prompts to include some of our latest learned.
• Prompt should also be better structured to optimise prefix caching (see here)