Rename type parameter to have uniformity with the actual implementations
ISPN-3807 Cache the result of HQL query parser to be reused
wip