cleanup
better and cleaner caching added
deleted legacy file