Add cache for resolve based on module context
Use underscore to indicate private properties on module instance
Remove unneccesary condition
Rebuild packages