Working on making the cache more usefull