Caching / bug fixes from tags replacement