[BUGFIX] Move creation of cached FCE definitions to own hook