Added some caching to run list