[FIXED JENKINS-16530] Improve icon caching.