Switch to unified view

a/cache.h b/cache.h