Minor changes. Consistent use of cache in comments.