Add session-id and request-id
Fix default caching
Merge branch 'local'