Only cache themes that are needed, classic theme fixes