Fixed some caching stuff w/ solder, added bulk vs. single support