Cache Structure Update - just needs state machine