Added cache feature to speed up the app