Comment 4 for bug 608485

Thanks for that; it's clear from looking at your branch where the bug is; I'll commit a proper fix when I'm in my development environment - there just needs to be conditional inclusion of the cache_info in that expression.