BAC-1231: cleanup cache control related code