Improved readability
Made caching work