Fixing caching problem #13