Upgraded bengler_test_helper.
Add cache headers
Merge branch 'master' into new_scopes