Issue #224: Less caching flexibility.