Add credentials caching