[FIX] Closing nocache tags

Fixes #1255 once merged.
Merge pull request #1259 from TheSerapher/issue-1255

[FIX] Closing nocache tags