Adds logs, fixes problem due to cache policy