fix possible caching hacks (closes #3)