Merge "Don't cache simple BooleanFlags." into tm-dev