LPS-32181 Refactor security access of template engine
LPS-32181 Better cache collection usage
LPS-32181 Source formatting