Updated issue with local cache running slowly