Fixing caching semantics.