Rewrite of cache access code
icon caching rewrite
oops
Getting close