1 files changed, 14 insertions, 4 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
index b6ab822c47..cc3a61a9df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
@@ -58,22 +58,32 @@ void ButtonGetCapabilitiesResponse::Run() {
       static_cast<hmi_apis::Common_Result::eType>(
           (*message_)[strings::params][hmi_response::code].asInt());
 
+  hmi_capabilities_.UpdateRequestsRequiredForCapabilities(
+      hmi_apis::FunctionID::Buttons_GetCapabilities);
+
   if (hmi_apis::Common_Result::SUCCESS != code) {
     LOG4CXX_ERROR(logger_, "Error is returned. Capabilities won't be updated.");
     return;
   }
 
-  HMICapabilities& hmi_capabilities = hmi_capabilities_;
-
-  hmi_capabilities.set_button_capabilities(
+  std::vector<std::string> sections_to_update{
+      hmi_response::button_capabilities};
+  hmi_capabilities_.set_button_capabilities(
       (*message_)[strings::msg_params][hmi_response::capabilities]);
 
   if ((*message_)[strings::msg_params].keyExists(
           hmi_response::preset_bank_capabilities)) {
-    hmi_capabilities.set_preset_bank_capabilities(
+    sections_to_update.push_back(hmi_response::preset_bank_capabilities);
+    hmi_capabilities_.set_preset_bank_capabilities(
         (*message_)[strings::msg_params]
                    [hmi_response::preset_bank_capabilities]);
   }
+
+  if (!hmi_capabilities_.SaveCachedCapabilitiesToFile(
+          hmi_interface::buttons, sections_to_update, message_->getSchema())) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed to save Buttons.GetCapabilities response to cache");
+  }
 }
 
 }  // namespace commands