Add selection for OS and category.

Add caching for each OS/Category combination.