Add solder caching