Added caching support! Cool!!