CD-3793 : fix the cache control. Copied the fix from the last dev version of the module.