possible #16 fix? (bigpicture caching bug)