diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Get.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Get.pm
index e568f5aaa1..7fcf75607d 100644
--- a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Get.pm
+++ b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Get.pm
@@ -17,7 +17,7 @@ use constant TRACE => 0;
 #    * erp_row
 #    * erp_col
 sub process {
-    my ( $session, $plugin, $verb, $response ) = @_;
+    my ( $app, $plugin, $verb, $response ) = @_;
     my $query = Foswiki::Func::getCgiQuery();
 
     unless ($query) {
diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/JQuery.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/JQuery.pm
index 2719c6bd94..9aa8c5e7b5 100644
--- a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/JQuery.pm
+++ b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/JQuery.pm
@@ -14,31 +14,21 @@
 # http://www.gnu.org/copyleft/gpl.html
 
 package Foswiki::Plugins::EditRowPlugin::JQuery;
-use strict;
+use v5.14;
 
-use Assert;
+use Moo;
+extends qw( Foswiki::Plugins::JQueryPlugin::Plugin );
 
-use Foswiki::Plugins::JQueryPlugin::Plugin ();
-our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );
-
-sub new {
-    my $class = shift;
-    my $session = shift || $Foswiki::Plugins::SESSION;
-
-    my $this = $class->SUPER::new(
-        $session,
-        name          => 'EditRow',
-        version       => '1.0',
-        author        => 'Crawford Currie',
-        homepage      => 'http://foswiki.org/Extensions/EditRowPlugin',
-        puburl        => '%PUBURLPATH%/%SYSTEMWEB%/EditRowPlugin',
-        css           => ["erp.css"],
-        documentation => "$Foswiki::cfg{SystemWebName}.EditRowPlugin",
-        javascript    => [ "erp.js", "TableSort.js" ],
-        dependencies  => [ 'UI', 'JEditable' ]
-    );
-
-    return $this;
-}
+our %pluginParams = (
+    name          => 'EditRow',
+    version       => '1.0',
+    author        => 'Crawford Currie',
+    homepage      => 'http://foswiki.org/Extensions/EditRowPlugin',
+    puburl        => '%PUBURLPATH%/%SYSTEMWEB%/EditRowPlugin',
+    css           => ["erp.css"],
+    documentation => "$Foswiki::cfg{SystemWebName}.EditRowPlugin",
+    javascript    => [ "erp.js", "TableSort.js" ],
+    dependencies  => [ 'UI', 'JEditable' ]
+);
 
 1;
diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Save.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Save.pm
index 10e3c14a37..00898fa134 100644
--- a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Save.pm
+++ b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Save.pm
@@ -24,7 +24,7 @@ use constant TRACE => 0;
 #      match the latest rev of the topic, the save will be aborted.
 #    * erp_stop_edit - if true, stop editing after save complete
 sub process {
-    my ( $session, $plugin, $verb, $response ) = @_;
+    my ( $app, $plugin, $verb, $response ) = @_;
     my $query = Foswiki::Func::getCgiQuery();
 
     unless ($query) {
@@ -230,7 +230,7 @@ sub process {
             require Foswiki::Validation;
             my $context =
               $query->url( -full => 1, -path => 1, -query => 1 ) . time();
-            my $cgis = $session->getCGISession();
+            my $cgis = $app->users->getCGISession();
             my $nonce;
             if ( Foswiki::Validation->can('generateValidationKey') ) {
                 $nonce =
diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/View.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/View.pm
index d9a63d9b63..43f462f7e9 100644
--- a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/View.pm
+++ b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/View.pm
@@ -17,7 +17,7 @@ use Foswiki::Func();
 #    * erp_table
 #    * erp_row
 sub process {
-    my ( $text, $web, $topic, $meta ) = @_;
+    my ( $app, $text, $web, $topic, $meta ) = @_;
 
     my $macro = $Foswiki::cfg{Plugins}{EditRowPlugin}{Macro} || 'EDITTABLE';
 
@@ -33,15 +33,20 @@ sub process {
     return 0
       if Foswiki::Func::getPreferencesFlag('EDITROWPLUGIN_DISABLE') =~ /full/;
 
-    Foswiki::Plugins::JQueryPlugin::registerPlugin( 'EditRow',
+    my $pluginName = "EditRow";
+    Foswiki::Plugins::JQueryPlugin::registerPlugin( $pluginName,
         'Foswiki::Plugins::EditRowPlugin::JQuery' );
-    unless (
-        Foswiki::Plugins::JQueryPlugin::createPlugin(
-            "EditRow", $Foswiki::Plugins::SESSION
-        )
-      )
+    unless ( Foswiki::Plugins::JQueryPlugin::createPlugin( $pluginName, $app ) )
     {
-        die 'Failed to register JQuery plugin';
+        Foswiki::Exception::Fatal->throw(
+            text => "Failed to register JQuery plugin $pluginName: "
+              . (
+                DEBUG
+                ? Foswiki::Plugins::JQueryPlugin::Plugins::getPluginError(
+                    'EditRow')
+                : ''
+              )
+        );
     }
 
     require Foswiki::Plugins::EditRowPlugin::TableParser;
@@ -245,7 +250,7 @@ sub process {
     }
 
     if ($hasTables) {
-        $_[0] = join( "\n", @$content ) . ( $endsWithNewline ? "\n" : '' );
+        $_[1] = join( "\n", @$content ) . ( $endsWithNewline ? "\n" : '' );
         return 1;
     }
     return 0;
diff --git a/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm b/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm
index 5fd9ec57ee..0fe0af1980 100644
--- a/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm
+++ b/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm
@@ -15,19 +15,27 @@ around loadExtraConfig => sub {
     $Foswiki::cfg{Plugins}{EditTablePlugin}{Enabled} = 0;
 };
 
+around createNewFoswikiApp => sub {
+    my $orig = shift;
+    my $this = shift;
+
+    my $app = $orig->( $this, @_ );
+
+    $app->plugins->enable;
+
+    return $app;
+};
+
 sub test_simple_view {
     my $this = shift;
     require Foswiki::Plugins::EditRowPlugin::View;
     $this->assert( !$@, $@ );
     $this->clear_test_topicObject;
-    $this->clear_session;
-    my $query = Unit::Request->new( initializer => {} );
-    $this->session(
-        Foswiki->new(
-            user    => $this->test_user_login,
-            request => $query,
-            context => { view => 1 }
-        )
+    $this->createNewFoswikiApp(
+        requestParams => { initializer => {}, },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+        context => { view => 1 }
     );
     $this->test_topicObject(
         ( Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) )[0] );
@@ -38,8 +46,9 @@ sub test_simple_view {
 INPUT
     $this->assert(
         Foswiki::Plugins::EditRowPlugin::View::process(
-            $in,               $this->test_web,
-            $this->test_topic, $this->test_topicObject
+            $this->app,      $in,
+            $this->test_web, $this->test_topic,
+            $this->test_topicObject
         )
     );
     $this->assert( $in =~ s/<!-- STARTINCLUDE.*?-->\s*(.*)\s*<!--.*/$1/s, $in );
@@ -125,18 +134,14 @@ sub test_Item12953 {
     require Foswiki::Plugins::EditRowPlugin::View;
     $this->assert( !$@, $@ );
     $this->clear_test_topicObject;
-    $this->clear_session;
-    my $query = Unit::Request->new( initializer => {} );
-    $this->session(
-        Foswiki->new(
-            user    => $this->test_user_login,
-            request => $query,
-            context => { view => 1 }
-        )
+    $this->createNewFoswikiApp(
+        requestParams => { initializer => {}, },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+        context => { view => 1 }
     );
     $this->test_topicObject(
-        ( Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} ) )
-        [0] );
+        ( Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) )[0] );
 
     my $in = <<INPUT;
 %EDITTABLE{
@@ -146,8 +151,9 @@ sub test_Item12953 {
 INPUT
     $this->assert(
         Foswiki::Plugins::EditRowPlugin::View::process(
-            $in,               $this->test_web,
-            $this->test_topic, $this->test_topicObject
+            $this->app,      $in,
+            $this->test_web, $this->test_topic,
+            $this->test_topicObject
         )
     );
     $this->assert( $in =~ s/\s*<!-- STARTINCLUDE.*?-->\s*(.*)\s*<!--.*/$1/s,
@@ -187,18 +193,19 @@ sub test_edit_view_default {
     require Foswiki::Plugins::EditRowPlugin::View;
     $this->assert( !$@, $@ );
     $this->clear_test_topicObject;
-    $this->clear_session;
-    my $query = Unit::Request->new(
-        initializer => {
-            erp_topic => $this->test_web . "." . $this->test_topic,
-            erp_table => 'TABLE_0'
-        }
+    $this->createNewFoswikiApp(
+        requestParams => {
+            initializer => {
+                erp_topic => $this->test_web . "." . $this->test_topic,
+                erp_table => 'TABLE_0'
+            },
+        },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+        context => { view => 1 },
     );
-    $this->session(
-        Foswiki->new( $this->{test_user_login}, $query, { view => 1 } ) );
     $this->test_topicObject(
-        ( Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} ) )
-        [0] );
+        ( Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) )[0] );
 
     my $in = <<INPUT;
 %EDITTABLE%
@@ -206,8 +213,9 @@ sub test_edit_view_default {
 INPUT
     $this->assert(
         Foswiki::Plugins::EditRowPlugin::View::process(
-            $in,               $this->test_web,
-            $this->test_topic, $this->test_topicObject
+            $this->app,      $in,
+            $this->test_web, $this->test_topic,
+            $this->test_topicObject
         )
     );
     $this->assert( $in =~ s/<!-- STARTINCLUDE.*?-->\s*(.*)\s*<!--.*/$1/s, $in );
@@ -250,18 +258,19 @@ sub test_edit_view_no_js {
     require Foswiki::Plugins::EditRowPlugin::View;
     $this->assert( !$@, $@ );
     $this->clear_test_topicObject;
-    $this->clear_session;
-    my $query = Unit::Request->new(
-        initializer => {
-            erp_topic => $this->test_web . "." . $this->test_topic,
-            erp_table => 'TABLE_0'
-        }
+    $this->createNewFoswikiApp(
+        requestParams => {
+            initializer => {
+                erp_topic => $this->test_web . "." . $this->test_topic,
+                erp_table => 'TABLE_0'
+            },
+        },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+        context => { view => 1 },
     );
-    $this->session(
-        Foswiki->new( $this->{test_user_login}, $query, { view => 1 } ) );
     $this->test_topicObject(
-        ( Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} ) )
-        [0] );
+        ( Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) )[0] );
 
     my $in = <<INPUT;
 %EDITTABLE{js="ignore"}%
@@ -269,8 +278,9 @@ sub test_edit_view_no_js {
 INPUT
     $this->assert(
         Foswiki::Plugins::EditRowPlugin::View::process(
-            $in,               $this->test_web,
-            $this->test_topic, $this->test_topicObject
+            $this->app,      $in,
+            $this->test_web, $this->test_topic,
+            $this->test_topicObject
         )
     );
     $this->assert( $in =~ s/<!-- STARTINCLUDE.*?-->\s*(.*)\s*<!--.*/$1/s, $in );
diff --git a/EditRowPlugin/test/unit/EditRowPlugin/Rest.pm b/EditRowPlugin/test/unit/EditRowPlugin/Rest.pm
index a3776e8e13..011cb28a32 100644
--- a/EditRowPlugin/test/unit/EditRowPlugin/Rest.pm
+++ b/EditRowPlugin/test/unit/EditRowPlugin/Rest.pm
@@ -7,7 +7,6 @@ extends qw(FoswikiFnTestCase);
 
 sub gettit {
     my ( $this, $t, $r, $c ) = @_;
-    $this->clear_session;
     my %qd = (
         erp_version => "VERSION",
         erp_topic   => $this->test_web . "." . $this->test_topic,
@@ -15,16 +14,17 @@ sub gettit {
     );
     $qd{erp_row} = $r if defined $r;
     $qd{erp_col} = $c if defined $c;
-    my $query = Unit::Request->new( initializer => \%qd );
-    $this->session(
-        Foswiki->new( user => $this->test_user_login, request => $query ) );
-    my $response = Foswiki::Response->new();
+    $this->createNewFoswikiApp(
+        requestParams => { initializer => \%qd, },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+    );
     $this->assert_null(
         Foswiki::Plugins::EditRowPlugin::Get::process(
-            $this->session, "EditRowPlugin", "get", $response
+            $this->app, "EditRowPlugin", "get", $this->app->response
         )
     );
-    return $response->body();
+    return $this->app->response->body;
 }
 
 sub test_rest_get {
@@ -43,7 +43,6 @@ sub test_rest_get {
 INPUT
     $this->test_topicObject->save();
     $this->clear_test_topicObject;
-    $this->clear_session;
 
     $this->assert_equals( '"1"', $this->gettit( 0, 0, 0 ) );
 
@@ -76,7 +75,6 @@ sub test_rest_save {
 INPUT
     $this->test_topicObject->save();
     $this->clear_test_topicObject;
-    $this->clear_session;
 
     my %qd = (
         CELLDATA    => "Spitoon",
@@ -88,16 +86,17 @@ INPUT
         erp_table   => "TABLE_1",
         noredirect  => 1,                                           # for AJAX
     );
-    my $query = Unit::Request->new( initializer => \%qd );
-    $this->session(
-        Foswiki->new( user => $this->test_user_login, request => $query ) );
-    my $response = Foswiki::Response->new();
+    $this->createNewFoswikiApp(
+        requestParams => { initializer => \%qd, },
+        engineParams =>
+          { initialAttributes => { user => $this->test_user_login, }, },
+    );
     $this->assert_null(
         Foswiki::Plugins::EditRowPlugin::Save::process(
-            $this->session, "EditRowPlugin", "save", $response
+            $this->app, "EditRowPlugin", "save", $this->app->response
         )
     );
-    $this->assert_equals( "RESPONSESpitoon", $response->body() );
+    $this->assert_equals( "RESPONSESpitoon", $this->app->response->body );
     $this->clear_test_topicObject;
     $this->test_topicObject(
         ( Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) )[0] );
diff --git a/JEditableContrib/lib/Foswiki/Contrib/JEditableContrib/JEDITABLE.pm b/JEditableContrib/lib/Foswiki/Contrib/JEditableContrib/JEDITABLE.pm
index 317453bbdc..6abfd53681 100644
--- a/JEditableContrib/lib/Foswiki/Contrib/JEditableContrib/JEDITABLE.pm
+++ b/JEditableContrib/lib/Foswiki/Contrib/JEditableContrib/JEDITABLE.pm
@@ -1,33 +1,23 @@
 package Foswiki::Contrib::JEditableContrib::JEDITABLE;
-use strict;
-use warnings;
 
-use Assert;
-
-use Foswiki::Plugins::JQueryPlugin ();
-our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );
+use v5.14;
 
-use Foswiki::Plugins::JQueryPlugin::Plugin ();
-use Foswiki::Contrib::JEditableContrib     ();
+use Assert;
 
-sub new {
-    my $class   = shift;
-    my $session = shift || $Foswiki::Plugins::SESSION;
-    my $src     = (DEBUG) ? '_src' : '';
+use Foswiki::Contrib::JEditableContrib ();
 
-    my $this = $class->SUPER::new(
-        $session,
-        name          => 'JEditable',
-        version       => $Foswiki::Contrib::JEditableContrib::RELEASE,
-        author        => 'Mika Tuupola',
-        homepage      => 'http://www.appelsiini.net/projects/jeditable',
-        puburl        => '%PUBURLPATH%/%SYSTEMWEB%/JEditableContrib',
-        documentation => "$Foswiki::cfg{SystemWebName}.JEditableContrib",
-        summary       => $Foswiki::Contrib::JEditableContrib::SHORTDESCRIPTION,
-        javascript    => ["jquery.jeditable${src}.js"]
-    );
+use Moo;
+extends qw( Foswiki::Plugins::JQueryPlugin::Plugin );
 
-    return $this;
-}
+our %pluginParams = (
+    name          => 'JEditable',
+    version       => $Foswiki::Contrib::JEditableContrib::RELEASE,
+    author        => 'Mika Tuupola',
+    homepage      => 'http://www.appelsiini.net/projects/jeditable',
+    puburl        => '%PUBURLPATH%/%SYSTEMWEB%/JEditableContrib',
+    documentation => "$Foswiki::cfg{SystemWebName}.JEditableContrib",
+    summary       => $Foswiki::Contrib::JEditableContrib::SHORTDESCRIPTION,
+    javascript    => [ "jquery.jeditable" . ( DEBUG ? "_src" : "" ) . ".js" ]
+);
 
 1;
diff --git a/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/JQueryVersion.pm b/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/JQueryVersion.pm
index f9f082e37b..8edd48ec5f 100644
--- a/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/JQueryVersion.pm
+++ b/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/JQueryVersion.pm
@@ -9,9 +9,11 @@ use namespace::clean;
 extends qw( Foswiki::Configure::Checker );
 
 sub check {
-    my $this      = shift;
-    my $e         = '';
-    my $jqversion = $Foswiki::cfg{JQueryPlugin}{JQueryVersion};
+    my $this = shift;
+    my $e    = '';
+
+    my $cfgData   = $Foswiki::app->cfg->data;
+    my $jqversion = $cfgData->{JQueryPlugin}{JQueryVersion};
 
     if ( !$jqversion ) {
         return $this->ERROR(<<'MESSAGE');
@@ -29,9 +31,8 @@ MESSAGE
     if (
         not -f File::Spec->catfile(
             File::Spec->splitdir( $Foswiki::cfg{PubDir} ),
-            $Foswiki::cfg{SystemWebName},
-            'JQueryPlugin',
-            $jqversion . '.js'
+            $cfgData->{SystemWebName},
+            'JQueryPlugin', $jqversion . '.js'
         )
       )
     {
diff --git a/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/Plugins/Autocomplete/Enabled.pm b/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/Plugins/Autocomplete/Enabled.pm
index 50e72125c8..8f4290bc70 100644
--- a/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/Plugins/Autocomplete/Enabled.pm
+++ b/JQueryPlugin/lib/Foswiki/Configure/Checkers/JQueryPlugin/Plugins/Autocomplete/Enabled.pm
@@ -9,7 +9,10 @@ sub check {
     my $this = shift;
     my $warnings;
 
-    if ( $Foswiki::cfg{JQueryPlugin}{Plugins}{Autocomplete}{Enabled} ) {
+    if (
+        $Foswiki::app->cfg->data->{JQueryPlugin}{Plugins}{Autocomplete}{Enabled}
+      )
+    {
         $warnings .= $this->WARN(<<'HERE');
 Autocomplete has been deprecated.  Please use the autocomplete plugin part of the jQuery-ui package. 
 The new plugin is not backwards compatible. See the JQueryPlugin documentation for further details.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
index 8a41852bfa..a40e879a73 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
@@ -158,148 +158,148 @@ sub registerTheme {
 
 =begin TML
 
----++ handleButton($session, $params, $topic, $web) -> $result
+---++ handleButton($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>BUTTON% tag. 
 
 =cut
 
 sub handleButton {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Button', $session );
+    my $plugin = createPlugin( 'Button', $app );
     return $plugin->handleButton(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleRestTmpl($session, $params, $topic, $web) -> $result
+---++ handleRestTmpl($app, $params, $topic, $web) -> $result
 
 Handles the tmpl rest handler
 
 =cut
 
 sub handleRestTmpl {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'render', $session );
-    return $plugin->restTmpl( $session, @_ ) if $plugin;
+    my $plugin = createPlugin( 'render', $app );
+    return $plugin->restTmpl( $app, @_ ) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handlePopUpWindow($session, $params, $topic, $web) -> $result
+---++ handlePopUpWindow($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>POPUPWINDOW% tag. 
 
 =cut
 
 sub handlePopUpWindow {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'PopUpWindow', $session );
+    my $plugin = createPlugin( 'PopUpWindow', $app );
     return $plugin->handlePopUpWindow(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleToggle($session, $params, $topic, $web) -> $result
+---++ handleToggle($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>TOGGLE% tag. 
 
 =cut
 
 sub handleToggle {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Toggle', $session );
+    my $plugin = createPlugin( 'Toggle', $app );
     return $plugin->handleToggle(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleTabPane($session, $params, $topic, $web) -> $result
+---++ handleTabPane($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>TABPANE% tag. 
 
 =cut
 
 sub handleTabPane {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Tabpane', $session );
+    my $plugin = createPlugin( 'Tabpane', $app );
     return $plugin->handleTabPane(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleTab($session, $params, $topic, $web) -> $result
+---++ handleTab($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>TAB% tag. 
 
 =cut
 
 sub handleTab {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Tabpane', $session );
+    my $plugin = createPlugin( 'Tabpane', $app );
     return $plugin->handleTab(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleEndTab($session, $params, $topic, $web) -> $result
+---++ handleEndTab($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>ENDTAB% tag. 
 
 =cut
 
 sub handleEndTab {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Tabpane', $session );
+    my $plugin = createPlugin( 'Tabpane', $app );
     return $plugin->handleEndTab(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleEndTabPane($session, $params, $topic, $web) -> $result
+---++ handleEndTabPane($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>ENDTABPANE% tag. 
 
 =cut
 
 sub handleEndTabPane {
-    my $session = shift;
+    my $app = shift;
 
-    my $plugin = createPlugin( 'Tabpane', $session );
+    my $plugin = createPlugin( 'Tabpane', $app );
     return $plugin->handleEndTabPane(@_) if $plugin;
     return '';
 }
 
 =begin TML
 
----++ handleJQueryRequire($session, $params, $topic, $web) -> $result
+---++ handleJQueryRequire($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>JQREQUIRE% tag. 
 
 =cut
 
 sub handleJQueryRequire {
-    my ( $session, $params, $theTopic, $theWeb ) = @_;
+    my ( $app, $params, $theTopic, $theWeb ) = @_;
 
     my $plugins = $params->{_DEFAULT} || '';
     my $warn = Foswiki::Func::isTrue( $params->{warn}, 1 );
     my $errorMsg = '';
     foreach my $pluginName ( split( /\s*,\s*/, $plugins ) ) {
-        my $plugin = createPlugin( $pluginName, $session );
+        my $plugin = createPlugin( $pluginName, $app );
         $errorMsg .= _inlineError("No such plugin $pluginName")
           if !$plugin && $warn;
     }
@@ -309,14 +309,14 @@ sub handleJQueryRequire {
 
 =begin TML
 
----++ handleJQueryTheme($session, $params, $topic, $web) -> $result
+---++ handleJQueryTheme($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>JQTHEME% tag. 
 
 =cut
 
 sub handleJQueryTheme {
-    my ( $session, $params, $theTopic, $theWeb ) = @_;
+    my ( $app, $params, $theTopic, $theWeb ) = @_;
 
     my $themeName = $params->{_DEFAULT}
       || $Foswiki::cfg{JQueryPlugin}{JQueryTheme};
@@ -331,14 +331,14 @@ sub handleJQueryTheme {
 
 =begin TML
 
----++ handleJQueryIconPath($session, $params, $topic, $web) -> $result
+---++ handleJQueryIconPath($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>JQICONPATH% tag. 
 
 =cut
 
 sub handleJQueryIconPath {
-    my ( $session, $params, $theTopic, $theWeb ) = @_;
+    my ( $app, $params, $theTopic, $theWeb ) = @_;
 
     my $iconName = $params->{_DEFAULT} || '';
     return Foswiki::Plugins::JQueryPlugin::Plugins::getIconUrlPath($iconName);
@@ -346,14 +346,14 @@ sub handleJQueryIconPath {
 
 =begin TML
 
----++ handleJQueryIcon($session, $params, $topic, $web) -> $result
+---++ handleJQueryIcon($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>JQICON% tag. 
 
 =cut
 
 sub handleJQueryIcon {
-    my ( $session, $params, $theTopic, $theWeb ) = @_;
+    my ( $app, $params, $theTopic, $theWeb ) = @_;
 
     my $iconName  = $params->{_DEFAULT} || '';
     my $iconAlt   = $params->{alt}      || $iconName;
@@ -404,14 +404,14 @@ sub handleJQueryIcon {
 
 =begin TML
 
----++ handleJQueryPlugins($session, $params, $topic, $web) -> $result
+---++ handleJQueryPlugins($app, $params, $topic, $web) -> $result
 
 Handles the =%<nop>JQPLUGINS% tag. 
 
 =cut
 
 sub handleJQueryPlugins {
-    my ( $session, $params, $theTopic, $theWeb ) = @_;
+    my ( $app, $params, $theTopic, $theWeb ) = @_;
 
     my $thePlugin    = $params->{_DEFAULT} || '';
     my $theFormat    = $params->{format};
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/EMPTY.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/EMPTY.pm
index d2cafa0f5b..df2e4b5de6 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/EMPTY.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/EMPTY.pm
@@ -42,11 +42,12 @@ Initialize this plugin by adding the required static files to the html header
 
 =cut
 
-sub DISinit {
+around DISinit => sub {
+    my $orig = shift;
     my $this = shift;
 
-    return unless $this->SUPER::init();
-}
+    return unless $orig->( $this, @_ );
+};
 
 =begin TML
 
@@ -63,8 +64,8 @@ and also
 
 <verbatim>
 sub handleEMPTY {
-  my $session = shift;
-  my $plugin = createPlugin('Empty', $session);
+  my $app = shift;
+  my $plugin = createPlugin('Empty', $app);
   return $plugin->handleEMPTY(@_) if $plugin;
   return '';
 }
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm
index 4abaa7aac4..6b382d7f42 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm
@@ -5,6 +5,8 @@ use v5.14;
 use Foswiki::Plugins::JQueryPlugin::Plugins ();
 use Foswiki::Func                           ();
 
+use Assert;
+
 use constant TRACE => 0;
 
 use Moo;
@@ -164,7 +166,13 @@ sub init {
                 # require Devel::StackTrace;
                 # $trace = Devel::StackTrace->new()->as_string()."\n";
 
-                print STDERR "ERROR: can't load plugin for $dep\n" . $trace;
+                say STDERR "ERROR: can't load JQuery plugin for $dep:",
+                  (
+                    DEBUG
+                    ? Foswiki::Plugins::JQueryPlugin::Plugins::getPluginError(
+                        $dep) // 'there is no plugin with this name'
+                    : ''
+                  );
             }
         }
     }
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
index 3af510768d..0e1b798036 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm
@@ -1,5 +1,6 @@
 # See bottom of file for license and copyright information
 package Foswiki::Plugins::JQueryPlugin::Plugins;
+use v5.14;
 
 use strict;
 use warnings;
@@ -293,6 +294,7 @@ sub load {
             Foswiki::Func::writeDebug(
                 "ERROR: can't load jQuery plugin $pluginName: $errStr");
             $pluginDesc->{instance} = 0;
+            $pluginDesc->{error}    = $errStr;
         };
 
         #eval "require $pluginDesc->{class};";
@@ -426,6 +428,22 @@ sub getPlugins {
 
 =begin TML
 
+---++ ClassMethod getPluginError($pluginName) => $error_message or undef
+
+Returns last error message for plugin =$pluginName=, or empty string if there
+was no error, or undef if there is no plugin with this name.
+
+=cut
+
+sub getPluginError {
+    my $pluginName = lc(shift);
+
+    return undef unless exists $plugins{$pluginName};
+    return $plugins{$pluginName}{error} // '';
+}
+
+=begin TML
+
 ---++ ClassMethod getRandom () -> $integer
 
 returns a random positive integer between 1 and 10000.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm
index 7378242204..6b13e12033 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SLIMBOX.pm
@@ -44,9 +44,9 @@ sub init {
     return unless $this->SUPER::init();
 
     # add translations to head
-    my $session = $Foswiki::Plugins::SESSION;
+    my $app = $this->app;
     my $counterText =
-      $session->i18n->maketext( "Image [_1] of [_2]", "{x}", "{y}" );
+      $app->i18n->maketext( "Image [_1] of [_2]", "{x}", "{y}" );
     Foswiki::Func::addToZone( "head", "JQUERYPLUGIN::SLIMBOX::COUNTERTEXT",
             '<meta name="foswiki.ImagePlugin.counterText" content="'
           . $counterText
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DATEPICKER.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DATEPICKER.pm
index ba885e4507..0876d0ef9e 100644
--- a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DATEPICKER.pm
+++ b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DATEPICKER.pm
@@ -55,8 +55,8 @@ sub init {
     return unless $this->SUPER::init();
 
     # open matching localization file if it exists
-    my $session = $Foswiki::Plugins::SESSION;
-    my $langTag = $session->i18n->language();
+    my $app     = $this->app;
+    my $langTag = $app->i18n->language();
     my $messagePath =
         $Foswiki::cfg{SystemWebName}
       . '/JQueryPlugin/i18n/jquery.ui.datepicker-'
diff --git a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
index 1e4cb51844..6a0f817e60 100644
--- a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
+++ b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
@@ -218,8 +218,8 @@ sub moveAttachment {
     my $oldLatest = _latestFile( $oldTopicObject, $oldAtt );
     if ( _e $oldLatest ) {
         my $newLatest = _latestFile( $newTopicObject, $newAtt );
-        _moveFile( $oldLatest, $newLatest );
-        _moveFile(
+        $this->_moveFile( $oldLatest, $newLatest );
+        $this->_moveFile(
             _historyDir( $oldTopicObject, $oldAtt ),
             _historyDir( $newTopicObject, $newAtt )
         );
@@ -250,12 +250,12 @@ sub copyAttachment {
     my $oldbase = _getPub($oldTopicObject);
     if ( _e "$oldbase/$oldAtt" ) {
         my $newbase = _getPub($newTopicObject);
-        _copyFile(
+        $this->_copyFile(
             _latestFile( $oldTopicObject, $oldAtt ),
             _latestFile( $newTopicObject, $newAtt )
         );
         if ( -e _historyDir( $oldTopicObject, $oldAtt ) ) {
-            _copyFile(
+            $this->_copyFile(
                 _historyDir( $oldTopicObject, $oldAtt ),
                 _historyDir( $newTopicObject, $newAtt )
             );
@@ -287,16 +287,18 @@ sub attachmentExists {
 sub moveTopic {
     my ( $this, $oldTopicObject, $newTopicObject, $cUID ) = @_;
 
-    _saveDamage($oldTopicObject);
+    $this->_saveDamage($oldTopicObject);
 
     my @revs;
     my $rev = _numRevisions( \@revs, $oldTopicObject );
 
-    _moveFile( _latestFile($oldTopicObject), _latestFile($newTopicObject) );
-    _moveFile( _historyDir($oldTopicObject), _historyDir($newTopicObject) );
+    $this->_moveFile( _latestFile($oldTopicObject),
+        _latestFile($newTopicObject) );
+    $this->_moveFile( _historyDir($oldTopicObject),
+        _historyDir($newTopicObject) );
     my $pub = _getPub($oldTopicObject);
     if ( _d $pub ) {
-        _moveFile( $pub, _getPub($newTopicObject) );
+        $this->_moveFile( $pub, _getPub($newTopicObject) );
     }
     if ( $Foswiki::Store::STORE_FORMAT_VERSION < 1.2 ) {
         if ( $newTopicObject->web ne $oldTopicObject->web ) {
@@ -327,13 +329,13 @@ sub moveWeb {
     my $oldbase = _getData($oldWebObject);
     my $newbase = _getData($newWebObject);
 
-    _moveFile( $oldbase, $newbase );
+    $this->_moveFile( $oldbase, $newbase );
 
     $oldbase = _getPub($oldWebObject);
     if ( _d $oldbase ) {
         $newbase = _getPub($newWebObject);
 
-        _moveFile( $oldbase, $newbase );
+        $this->_moveFile( $oldbase, $newbase );
     }
 
     if ( $Foswiki::Store::STORE_FORMAT_VERSION < 1.2 ) {
@@ -363,7 +365,7 @@ sub testAttachment {
 sub openAttachment {
     my ( $this, $meta, $att, $mode, @opts ) = @_;
     ASSERT($att) if DEBUG;
-    return _openBinaryStream( $meta, $att, $mode, @opts );
+    return $this->_openBinarySystem( $meta, $att, $mode, @opts );
 }
 
 # Implement Foswiki::Store
@@ -459,7 +461,7 @@ sub saveAttachment {
 
     ASSERT($name) if DEBUG;
 
-    _saveDamage( $meta, $name );
+    $this->_saveDamage( $meta, $name );
 
     my @revs;
     my $rn = _numRevisions( \@revs, $meta, $name ) + 1;
@@ -467,9 +469,9 @@ sub saveAttachment {
       ( $this->attachmentExists( $meta, $name ) ) ? 'update' : 'insert';
 
     my $latest = _latestFile( $meta, $name );
-    _saveStream( $latest, $stream );
+    $this->_saveStream( $latest, $stream );
     my $hf = _historyFile( $meta, $name, $rn );
-    _mkPathTo($hf);
+    $this->_mkPathTo($hf);
     File::Copy::copy( _encode( $latest, 1 ), _encode( $hf, 1 ) )
       or die "PlainFile: failed to copy $latest to $hf: $!";
 
@@ -492,7 +494,7 @@ sub saveAttachment {
     }
 
     my $mf = _metaFile( $meta, $name, $rn );
-    _writeMetaFile( $mf, $cUID, $comment );
+    $this->_writeMetaFile( $mf, $cUID, $comment );
 
     return $rn;
 }
@@ -501,7 +503,7 @@ sub saveAttachment {
 sub saveTopic {
     my ( $this, $meta, $cUID, $options ) = @_;
 
-    _saveDamage($meta);
+    $this->_saveDamage($meta);
 
     my $verb = ( _e _latestFile($meta) ) ? 'update' : 'insert';
     my @revs;
@@ -515,12 +517,13 @@ sub saveTopic {
 
     # Create new latest
     my $latest = _latestFile($meta);
-    _saveFile( $latest, Foswiki::Serialise::serialise( $meta, 'Embedded' ) );
+    $this->_saveFile( $latest,
+        Foswiki::Serialise::serialise( $meta, 'Embedded' ) );
 
     # Create history file by copying latest (modification date
     # doesn't matter, so long as it's >= $latest)
     my $hf = _historyFile( $meta, undef, $rn );
-    _mkPathTo($hf);
+    $this->_mkPathTo($hf);
     File::Copy::copy( _encode( $latest, 1 ), _encode( $hf, 1 ) )
       or die "PlainFile: failed to copy $latest to $hf: $!";
     if ( $options->{forcedate} ) {
@@ -531,7 +534,7 @@ sub saveTopic {
     }
 
     my $mf = _metaFile( $meta, undef, $rn );
-    _writeMetaFile( $mf, $cUID, $options->{comment} );
+    $this->_writeMetaFile( $mf, $cUID, $options->{comment} );
 
     if ( $Foswiki::Store::STORE_FORMAT_VERSION < 1.2 ) {
         my $extra = $options->{minor} ? 'minor' : '';
@@ -552,7 +555,7 @@ sub saveTopic {
 sub repRev {
     my ( $this, $meta, $cUID, %options ) = @_;
 
-    _saveDamage($meta);
+    $this->_saveDamage($meta);
 
     my @revs;
     my $rn = _numRevisions( \@revs, $meta );
@@ -567,13 +570,14 @@ sub repRev {
     $ti->{date}    = $options{forcedate} || time;
     $ti->{author}  = $cUID;
 
-    _saveFile( $latest, Foswiki::Serialise::serialise( $meta, 'Embedded' ) );
+    $this->_saveFile( $latest,
+        Foswiki::Serialise::serialise( $meta, 'Embedded' ) );
 
-    _mkPathTo($hf);
+    $this->_mkPathTo($hf);
     File::Copy::copy( _encode( $latest, 1 ), _encode( $hf, 1 ) )
       or die "PlainFile: failed to copy $latest to $hf: $!";
     my $mf = _metaFile( $meta, undef, $rn );
-    _writeMetaFile( $mf, $cUID, $options{comment} );
+    $this->_writeMetaFile( $mf, $cUID, $options{comment} );
 
     if ( $options{forcedate} ) {
         _utime( $options{forcedate}, $options{forcedate}, $latest )    # touch
@@ -600,7 +604,7 @@ sub repRev {
 sub delRev {
     my ( $this, $meta, $cUID ) = @_;
 
-    _saveDamage($meta);
+    $this->_saveDamage($meta);
 
     my @revs;
     _loadRevs( \@revs, _historyDir($meta) );
@@ -671,7 +675,7 @@ sub atomicLockInfo {
 sub atomicLock {
     my ( $this, $meta, $cUID ) = @_;
     my $filename = _getData($meta) . '.lock';
-    _saveFile( $filename, $cUID . "\n" . time );
+    $this->_saveFile( $filename, $cUID . "\n" . time );
 }
 
 # Implement Foswiki::Store
@@ -818,15 +822,15 @@ sub remove {
 
         # Topic or attachment
         _unlink( _latestFile( $meta, $attachment ) );
-        _rmtree( _encode( _historyDir( $meta, $attachment ), 1 ) );
-        _rmtree( _encode( _getPub($meta), 1 ) )
+        $this->_rmtree( _encode( _historyDir( $meta, $attachment ), 1 ) );
+        $this->_rmtree( _encode( _getPub($meta), 1 ) )
           unless ($attachment);    # topic only
     }
     else {
 
         # Web
-        _rmtree( _encode( _getData($meta), 1 ) );
-        _rmtree( _encode( _getPub($meta),  1 ) );
+        $this->_rmtree( _encode( _getData($meta), 1 ) );
+        $this->_rmtree( _encode( _getPub($meta),  1 ) );
     }
 
     return unless ( $Foswiki::Store::STORE_FORMAT_VERSION < 1.2 );
@@ -948,7 +952,7 @@ sub setLease {
 
     my $filename = _getData($meta) . '.lease';
     if ($lease) {
-        _saveFile( $filename, join( "\n", %$lease ) );
+        $this->_saveFile( $filename, join( "\n", %$lease ) );
     }
     elsif ( _e $filename ) {
         _unlink($filename)
@@ -1124,6 +1128,7 @@ sub _numRevisions {
 # Of course you may not care that the author is not modified by external
 # processes.....
 sub _saveDamage {
+    my $this = shift;
     my ( $meta, $attachment ) = @_;
     my $d;
 
@@ -1160,14 +1165,14 @@ DONE
           . time()
           . '" format="1.1" version="'
           . $rev . '"}%' . "\n$t";
-        _saveFile( $latest, $t );
+        $this->_saveFile( $latest, $t );
 
         # Creating the history second ensures it is more recent than the
         # latest.
     }
 
     my $hf = _historyFile( $meta, $attachment, $rev );
-    _mkPathTo($hf);
+    $this->_mkPathTo($hf);
     File::Copy::copy( _encode( $latest, 1 ), _encode( $hf, 1 ) )
       or die "PlainFile: failed to copy to $hf: $!";
 }
@@ -1204,9 +1209,10 @@ sub _readMetaFile {
 }
 
 sub _writeMetaFile {
-    my $mf = shift;
-    _mkPathTo($mf);
-    _saveFile( $mf, join( "\n", map { defined $_ ? $_ : '' } @_ ) );
+    my $this = shift;
+    my $mf   = shift;
+    $this->_mkPathTo($mf);
+    $this->_saveFile( $mf, join( "\n", map { defined $_ ? $_ : '' } @_ ) );
 }
 
 sub _readChanges {
@@ -1329,7 +1335,7 @@ sub recordChange {
     # Add the new change to the end of the file
     $args{time} = time;
     push( @changes, \%args );
-    _saveFile( $file, $json->encode( \@changes ) );
+    $this->_saveFile( $file, $json->encode( \@changes ) );
 }
 
 # Implement Foswiki::Store
@@ -1371,6 +1377,7 @@ sub _readTextFile {
 
 # Open a stream onto a (binary) file
 sub _openBinaryStream {
+    my $this = shift;
     my ( $meta, $att, $mode, %opts ) = @_;
     my $stream;
 
@@ -1384,7 +1391,7 @@ sub _openBinaryStream {
     }
     else {
         $path = _latestFile( $meta, $att );
-        _mkPathTo($path) if ( $mode =~ m/>/ );
+        $this->_mkPathTo($path) if ( $mode =~ m/>/ );
     }
     unless ( open( $stream, $mode, _encode( $path, 1 ) ) ) {
         die("PlainFile: open stream $mode '$path' failed: $!");
@@ -1395,8 +1402,9 @@ sub _openBinaryStream {
 
 # Save a file
 sub _saveFile {
+    my $this = shift;
     my ( $file, $text ) = @_;
-    _mkPathTo($file);
+    $this->_mkPathTo($file);
     my $efile = _encode( $file, 1 );
     my $fh;
     open( $fh, '>', $efile )
@@ -1417,9 +1425,10 @@ sub _saveFile {
 
 # Save a (binary) stream to a file
 sub _saveStream {
+    my $this = shift;
     my ( $file, $fh ) = @_;
 
-    _mkPathTo($file);
+    $this->_mkPathTo($file);
     my $F;
     my $efile = _encode( $file, 1 );
     open( $F, '>', $efile ) or die "PlainFile: open $file failed: $!";
@@ -1436,9 +1445,10 @@ sub _saveStream {
 # Move a file or directory from one absolute file path to another.
 # if the destination already exists it's an error.
 sub _moveFile {
+    my $this = shift;
     my ( $from, $to ) = @_;
     die "PlainFile: move target $to already exists" if _e $to;
-    _mkPathTo($to);
+    $this->_mkPathTo($to);
     my $ok;
     my $efrom = _encode( $from, 1 );
     $ok = File::Copy::Recursive::rmove( $efrom, _encode( $to, 1 ) );
@@ -1448,10 +1458,11 @@ sub _moveFile {
 # Copy a file or directory from one absolute file path to another.
 # if the destination already exists it's an error.
 sub _copyFile {
+    my $this = shift;
     my ( $from, $to ) = @_;
 
     die "PlainFile: move target $to already exists" if _e $to;
-    _mkPathTo($to);
+    $this->_mkPathTo($to);
     my $ok;
     my $efrom = _encode( $from, 1 );
     if ( -d $efrom ) {
@@ -1465,6 +1476,7 @@ sub _copyFile {
 
 # Make all directories above the path
 sub _mkPathTo {
+    my $this = shift;
     my $file = _encode( shift, 1, 'FilenameEncoding' );
 
     ASSERT( File::Spec->file_name_is_absolute($file), $file ) if DEBUG;
@@ -1480,9 +1492,12 @@ sub _mkPathTo {
     my $err;
     eval {
         File::Path::mkpath(
-            $path, 0,
-            $Foswiki::cfg{Store}{dirPermission},
-            { error => \$err }
+            $path,
+            {
+                verbose => 0,
+                mode    => $this->app->cfg->data->{Store}{dirPermission},
+                error   => \$err,
+            }
         );
     };
     if ( scalar @{$err} ) {
@@ -1498,6 +1513,7 @@ sub _mkPathTo {
 
 # Remove an entire directory tree. $root must be encoded.
 sub _rmtree {
+    my $this = shift;
     my $root = shift;
     my $D;
     if ( opendir( $D, $root ) ) {
@@ -1508,7 +1524,7 @@ sub _rmtree {
             $entry =~ m/^(.*)$/;
             $entry = "$root/$1";
             if ( -d $entry ) {
-                _rmtree($entry);
+                $this->_rmtree($entry);
             }
             elsif ( !unlink($entry) && -e $entry ) {
                 my $mess = 'PlainFile: Failed to delete file '
@@ -1528,7 +1544,7 @@ sub _rmtree {
         closedir($D);
 
         if ( !rmdir($root) ) {
-            if ( $Foswiki::cfg{OS} ne 'WINDOWS' ) {
+            if ( $this->app->cfg->data->{OS} ne 'WINDOWS' ) {
                 die 'PlainFile: Failed to delete ' . _decode($root) . ": $!";
             }
             else {