Cleanup inactive runtime slugs
Fix caching of the slugs
Merge branch 'runtime-cleanup2'