rework cache control issue