Re-enable caching.

Fixes #15