Added super-caching capabilities