PROGRESS: Start caching the flow
PROGRESS: More work on performance and templating