Add cache to results
Use cached results and remove old code