Add support for caching markups