2 bug corrections.
* cached_block was not being updated correctly when blocks were invalidated.
* index with a token of length 1 returned wrong indexes when  found using cross-blocks.