// Copyright 2017 The Bazel Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.devtools.build.lib.runtime;

import com.google.devtools.build.lib.buildtool.BuildRequest;
import com.google.devtools.build.lib.exec.ExecutorBuilder;
import com.google.devtools.build.lib.exec.SpawnCache;

/**
 * Module providing a default no-op spawn cache.
 */
public final class NoSpawnCacheModule extends BlazeModule {

  @Override
  public void executorInit(CommandEnvironment env, BuildRequest request, ExecutorBuilder builder) {
    builder.addActionContext(SpawnCache.class, SpawnCache.NO_CACHE, "no-cache");
  }
}

@@ -759,31 +759,43 @@
 ib.exec.
-ExecutorBuilder
+ModuleActionContextRegistry
 ;%0Aimport
@@ -991,21 +991,97 @@
 oid 
-executorInit(
+registerActionContexts(%0A      ModuleActionContextRegistry.Builder registryBuilder,%0A      
 Comm
@@ -1099,16 +1099,22 @@
 ent env,
+%0A     
  BuildRe
@@ -1123,72 +1123,52 @@
 est 
-request, ExecutorBuilder builder) %7B%0A    builder.addActionContext
+buildRequest) %7B%0A    registryBuilder.register
 (Spa

Update NoSpawnCacheModule to use registry methods instead of executorInit where possible.