Merge "Cache the results to avoid repetitive binder queries" into main