Refactor cacheing syntax styles