Block: cache - remember context - style fix