Fixes issue #34 - added account ID to the cache key