improved flight, module caching and scopes