Make site work with frontend_module_output_caching branch