#JC-1381 - Fixed caching when no logo or icon was set  and default was used