No.  Once any solution is applied for the caching issue #21012 addresses [Florian rightly rejects that solution as under-developed] then this whole wad of work will not be needed.