Addition of caching to flight table