Fix issues
Added records caching