Fixed issue with cache resolver not being set by default in builder
Merge branch 'fix/content-settings' into develop

* fix/content-settings:
  Fixed issue with cache resolver not being set by default in builder