Adding caching on versions