Use cached list function for units
Merge pull request #181 from bendiy/master

Use cached list function for units