fixed header bug
Merge branch 'bugfix/cache-header' into develop