Merge "Revert "Revert "Add testHttpEngine_EnableHttpCache"""