TYPO3.Fluid

I use a condition for evaluating which layout to load:

<f:layout name="{f:if(condition: checkCondition, then: 'Layout1', else: 'Layout2')}"/>

On the first request (template is not cached) it works fine, but on the second requets (template is loaded from cache) following error is thrown:

#1: Notice: Undefined variable: self in /Data/Temporary/Development/Cache/Code/Fluid_TemplateCache/PACKAGE_CONTROLLER_action_ACTION_20bd4ce9d92ee470c3edcf16e49b6ebec6252766.php line 16 

This error can be fixed by adding a single line in store() of class TemplateCompiler (TYPO3.Fluid\Classes\TYPO3\Fluid\Core\Compiler\TemplateCompiler.php). The template code ($templateCode) have to be enhanced in the first line of getLayoutName() by

\$self = \$this;

To clarify, the final template code:

$templateCode = <<<EOD
%s {

public function getVariableContainer() {
    // TODO
    return new \TYPO3\Fluid\Core\ViewHelper\TemplateVariableContainer();
}
public function getLayoutName(\TYPO3\Fluid\Core\Rendering\RenderingContextInterface \$renderingContext) {
\$self = \$this;
%s
return %s;
}
public function hasLayout() {
return %s;
}

%s

}
EOD;