Added id caching
Added id caching