updated to localcache based on feedback