Two fixes
Merge branch 'development' into f/per-request-cache-policy
Add per request cache policy option