vot-21: Adds some caching support