Added basic cache for Clients