Cache icon searches for performance

This had a speed improvement of around 15%
Cleanup
Remove obsolete TODO