some fixes, added tag back to cache