Crossword Genius

Drink with golf partner in bag store (3,5)

Ross

I believe the answer is:

tea caddy

I'm a little stuck... Click here to teach me more about this clue!

'bag store' is the definition.
The definition and answer can be both man-made objects as well as being singular nouns.
Perhaps they are linked in a way I don't understand?

'drink with golf partner' is the wordplay.
'drink' becomes 'tea' (tea is a drink).
'with' means one lot of letters go next to another.
'golf partner' becomes 'caddy' (I can't justify this - if you can you should give a lot more credence to this answer).
'tea'+'caddy'='TEA-CADDY'

'in' acts as a link.

Can you help me to learn more?

(Other definitions for tea caddy that I've seen before include "Container for bags (or leaves)" , "leaves container in the kitchen" , "Container for Earl Grey etc" , "source of refreshment?" , "drink dispenser" .)

I've seen this clue in The Independent.
Want a hint initially instead of a full solution? Install my app