Added a very simple cache
Rewrote list creater code