Adding some basic caching capabilities