categories selector cache
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  categories selector cache