improve cache control
Merge branch 'hotfix/cache-control'