Added caching to Solder API