Closes #58 - fix for cache issue