Enhance/refactor cache for wikidot