Minor tweak to support caching.