Cleanup of InlineCache validation methods