Added bulk/single support for solder caching