Added cache support to speed to the page load