Oops, return the correct item from the cache.

We just swapped the item/bitem keys and values, so the one we want to
return is actually now in bitem.

/me goes to write some unit tests