Another attempt to speed up NSG form.
Merge branch 'cache'