#134 - Use content cache for all icons

#134