fixed caching issues (closes #10)