Working on new cache structure