Little fixup in caching.