Set some functions to be cached to improve performance
Automatic changes, no effect on model
Merge remote-tracking branch 'origin/DMI_Integration' into DMI_Integration