Adding some caching, helps a bit