Added additional variable for caching, to lower over head