MUMUP-1297 : fix promise over-caching issue

Moved promises back to functions so they don't aggressively cache