Bug fixes

bug fixes and improvements for cache