include server own URL into cache key
Merge branch 'v0.8' into v0.9