fixed issues with caching when tags were used