Fix the loop
Fixed the big list
Fix caching