Little fixup in caching.
Bugfix in caching